drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,998 Commits 1 Branch 0 Tags
Commit Graph

63998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
d25ad2fdbb cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 
docs: remove some "new" tags from side navs

Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
 2011-12-15 15:43:21 -08:00
Chet Haase
2a47c14e2a Fix issues from recent glyph caching change 
There were 2 issues remaining after a recent change to support
glyph caching from multiple textures:
- memory in the GPU for all textures was being allocated automatically.
This is now lazy, being allocated only when those textures are first
needed.
- filtering (applied when a rendered object is transformed) was ignoring
the new multiple-texture structure. Filtering should be applied correctly
whenever we change textures.

Change-Id: I5c8eb8d46c73cd01782a353fc79b11cacc2146ab
 2011-12-15 15:43:02 -08:00
Jeff Sharkey
27c751dc00 Merge "Restrict app data on metered networks." 2011-12-15 15:37:21 -08:00
Glenn Kasten
af62dbca02 Simplify enable/disable mixing 
The MIXING enum isn't needed, and now returns void instead of status_t.

Change-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9
 2011-12-15 15:00:28 -08:00
Adam Koch
909fe93021 Minor tweaks to Sharing class, updated some typos, wording and a screenshot. 
Change-Id: If456e812e8627d2cc361e1ad0d42439cbd53d43c
 2011-12-15 17:56:31 -05:00
Marco Nelissen
24ef465d7f Merge "Add ContentProvider.dump()" 2011-12-15 14:41:36 -08:00
Jeff Sharkey
f60d0afd1e Restrict app data on metered networks. 
This separates the definition of "metered network" and "network with
limit."  For now, all mobile networks are considered metered.

Bug: 5571454
Change-Id: I394cd385bd33add75e53bfc9cf2fefd06a00208a
 2011-12-15 14:30:04 -08:00
Scott Main
b408531f00 am a739235a: am 43834487: docs: remove some "new" tags from side navs 
* commit 'a739235aed598fbd40c63d5e01e8bf55836b0de0':
  docs: remove some "new" tags from side navs
 2011-12-15 13:16:27 -08:00
Scott Main
a739235aed am 43834487: docs: remove some "new" tags from side navs 
* commit '43834487a183b69783b0de270f9b761f3afffdc1':
  docs: remove some "new" tags from side navs
 2011-12-15 13:14:41 -08:00
Scott Main
43834487a1 docs: remove some "new" tags from side navs 
Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
 2011-12-15 13:11:12 -08:00
Glenn Kasten
4b220f0a7b Improve resistance to leaks for ConfigEvent 
A Vector of pointers is risky, as there is no ownership (and the
ThreadBase destructor was not deleting them, so if there were any left
over at end it would leak).  Replaced by a Vector of values.

Change-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c
 2011-12-15 12:51:52 -08:00
Marco Nelissen
18cb28756c Add ContentProvider.dump() 
This is similar to the existing dump() facility for services.
ContentProviders can now implement dump() and that info will be shown
when running "dumpsys activity provider" and when taking a bugreport.

Change-Id: I33b3b132e3c4f920153355cc368eda2f725a715f
 2011-12-15 12:13:59 -08:00
Jeff Sharkey
8a0a72c7c1 Merge "Move NMS to CONNECTIVITY_INTERNAL permission." 2011-12-15 11:53:05 -08:00
Jeff Sharkey
56381b5481 Merge "Clear reply before writing exception." 2011-12-15 11:51:32 -08:00
Scott Main
3766a7a275 am 7e065061: am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '7e065061bb47fe88421a6edf62c846144e30fcd8':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:13:31 -08:00
Scott Main
7e065061bb am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:11:39 -08:00
Scott Main
481cd5a893 am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '3d672e1e789e171e913605945efe95a477ab0505':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:08:51 -08:00
Glenn Kasten
d9a723bc92 Merge "Fix build error when verbose logging is enabled" 2011-12-15 10:46:14 -08:00
Scott Main
4fbed59804 am fbc17ecc: am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'fbc17eccea267c7cee344ac7e7898709f86b37df':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:45:50 -08:00
Scott Main
3d672e1e78 Android U Class: Monetization / Ads without Compromising User Experience 
Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
 2011-12-15 10:44:11 -08:00
Scott Main
fbc17eccea am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'cf927f229f55849caf3461621023b5bd61908334':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:43:46 -08:00
Scott Main
cf927f229f am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'aed4ced6556383483209f454c9e4872e8ad28ebf':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:41:18 -08:00
Scott Main
aed4ced655 Android U Class: Developing Android Applications for the Enterprise. 
This class uses a sample app.

Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
 2011-12-15 10:38:32 -08:00
Martijn Coenen
cb1b2b8b1e Merge "Fix NPE on mock NDEF tech operations." 2011-12-15 10:32:11 -08:00
Martijn Coenen
23fc93a7c1 Fix NPE on mock NDEF tech operations. 
Change-Id: Ib67bd03b6275fdb86a5d6dedc6c7e4fed07ef8b0
 2011-12-15 10:28:52 -08:00
Scott Main
ed29dc09bf am ecaee21d: am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'ecaee21d3050f34bcb8c6d4bafec9764ab1a7027':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:17:15 -08:00
Scott Main
ecaee21d30 am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:15:21 -08:00
Scott Main
e4e6c06641 am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:13:07 -08:00
Scott Main
f9cca66e8b Docs: Training class on Identifying and Authenticating Users. 
Change-Id: Ie2005687ca3baf28d9e01be8c10ee0f6a58a3cc3
 2011-12-15 10:07:03 -08:00
Victoria Lease
3c65fad4de Merge "URL-decode tel: URIs." 2011-12-15 09:59:42 -08:00
Jesse Wilson
8543b5480d Give a reflection example for installing the HTTP response cache. 
From the Android developers blog,
http://android-developers.blogspot.com/2011/09/androids-http-clients.html

Change-Id: Iff0a06fb7b0b8c085b9f16e85b30db44c889235e
 2011-12-15 12:25:55 -05:00
Glenn Kasten
c434c90cc2 Use NULL not 0 for pointers 
Change-Id: Iab3f9abbdab617dc5a599e657ec46a0b0a002eef
 2011-12-15 09:18:17 -08:00
Glenn Kasten
16dabac224 Fix build error when verbose logging is enabled 
Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
 2011-12-15 08:34:59 -08:00
The Android Automerger
cb1f41d69c merge in ics-mr1-release history after reset to ics-mr1 2011-12-14 22:14:25 -08:00
John Wang
088f162899 Hide emergency call text if not support it. 
Show "emergency call only" text in carrier string
only if phone supports emergency calls.

bug:5570742
Change-Id: Ie826583fd55073e57c5fe4fe6e585781127caa6a
 2011-12-14 19:51:37 -08:00
Romain Guy
18ca25be58 Merge "Generate even fewer GL commands" 2011-12-14 19:25:20 -08:00
Romain Guy
8f85e80b64 Generate even fewer GL commands 
Change-Id: I0f4dcacb03ef5ee7f6ebd501df98bfead5f0a7f8
 2011-12-14 19:23:32 -08:00
Dianne Hackborn
51a0e745ee am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1 
* commit '13299a33e14562a5de14c89ad058d28ab0cd9f37':
  Fix some java docs.
 2011-12-14 18:21:29 -08:00
Dianne Hackborn
13299a33e1 am 399f1df3: Merge "Fix some java docs." into ics-mr1 
* commit '399f1df38594ea8bc927ad23bfbde996a9dc161d':
  Fix some java docs.
 2011-12-14 18:19:42 -08:00
Dianne Hackborn
399f1df385 Merge "Fix some java docs." into ics-mr1 2011-12-14 18:18:29 -08:00
Jeff Sharkey
7f97e65add Clear reply before writing exception. 
Changes Binder.execTransact() to clear any partial reply before
writing the exception.  Specifically, this fixes case where an
onTransact() could leave a writeNoException() floating in the reply.

Bug: 5686023
Change-Id: Ibc944464a010f5ec2fd8ef3cc84ac23d8260a491
 2011-12-14 18:07:54 -08:00
Jeff Sharkey
4529bb66c4 Move NMS to CONNECTIVITY_INTERNAL permission. 
Change-Id: I6043c1b9cb10aeeafb93d1b5c60da571d2fec5c9
 2011-12-14 17:51:13 -08:00
Glenn Kasten
25adf47477 Merge "Fix indentation and whitespace" 2011-12-14 17:35:36 -08:00
Glenn Kasten
927cc6c7e8 Merge "Improve AudioFlinger error logging" 2011-12-14 17:35:24 -08:00
Glenn Kasten
a55d4f9dab Merge "AudioMixer uninitialized simple fields" 2011-12-14 17:35:14 -08:00
Glenn Kasten
a763b44ee1 AudioMixer uninitialized simple fields 
Change-Id: I47e3849f048d4d990c9634f9c8a2ca2de0339e93
 2011-12-14 17:25:28 -08:00
Dirk Dougherty
41aeee2807 am 41d90f39: am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 
* commit '41d90f39a5c40e3036e15efef5b07789296c8bb9':
  Doc change: add MR1 API summary and updated highlights.
 2011-12-14 17:24:46 -08:00
Dirk Dougherty
41d90f39a5 am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 
* commit '26bd66df4fc8caa7885fe3a4e78e379389a24a94':
  Doc change: add MR1 API summary and updated highlights.
 2011-12-14 17:22:59 -08:00
Glenn Kasten
9818a9da59 Improve AudioFlinger error logging 
Change-Id: I8ce9aff4038cd7fa0067600faa8080b137db1939
 2011-12-14 17:22:40 -08:00
Dirk Dougherty
26bd66df4f Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 2011-12-14 17:21:13 -08:00