summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge "Clear reply before writing exception."Jeff Sharkey2011-12-151-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Clear reply before writing exception.Jeff Sharkey2011-12-141-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 7e065061: am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads ↵Scott Main2011-12-159-0/+306
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without Compromising User Experience * commit '7e065061bb47fe88421a6edf62c846144e30fcd8': Android U Class: Monetization / Ads without Compromising User Experience
| * | | | | | am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without ↵Scott Main2011-12-159-0/+306
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compromising User Experience * commit '481cd5a8938b5055942f3a9ccaeb08f373b8a4ea': Android U Class: Monetization / Ads without Compromising User Experience
| | * | | | | am 3d672e1e: Android U Class: Monetization / Ads without Compromising User ↵Scott Main2011-12-159-0/+306
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Experience * commit '3d672e1e789e171e913605945efe95a477ab0505': Android U Class: Monetization / Ads without Compromising User Experience
| | | * | | | Android U Class: Monetization / Ads without Compromising User ExperienceScott Main2011-12-159-0/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
* | | | | | | Merge "Fix build error when verbose logging is enabled"Glenn Kasten2011-12-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix build error when verbose logging is enabledGlenn Kasten2011-12-151-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
* | | | | | | am fbc17ecc: am cf927f22: am aed4ced6: Android U Class: Developing Android ↵Scott Main2011-12-156-1/+285
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | am cf927f22: am aed4ced6: Android U Class: Developing Android Applications ↵Scott Main2011-12-156-1/+285
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | am aed4ced6: Android U Class: Developing Android Applications for the ↵Scott Main2011-12-156-1/+285
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enterprise. This class uses a sample app. * commit 'aed4ced6556383483209f454c9e4872e8ad28ebf': Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
| | | * | | | Android U Class: Developing Android Applications for the Enterprise.Scott Main2011-12-156-1/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class uses a sample app. Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
* | | | | | | Merge "Fix NPE on mock NDEF tech operations."Martijn Coenen2011-12-152-2/+17
|\ \ \ \ \ \ \
| * | | | | | | Fix NPE on mock NDEF tech operations.Martijn Coenen2011-12-152-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib67bd03b6275fdb86a5d6dedc6c7e4fed07ef8b0
* | | | | | | | am ecaee21d: am e4e6c066: am f9cca66e: Docs: Training class on Identifying ↵Scott Main2011-12-154-0/+640
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Authenticating Users. * commit 'ecaee21d3050f34bcb8c6d4bafec9764ab1a7027': Docs: Training class on Identifying and Authenticating Users.
| * | | | | | | am e4e6c066: am f9cca66e: Docs: Training class on Identifying and ↵Scott Main2011-12-154-0/+640
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Authenticating Users. * commit 'e4e6c06641a6446c0f26a0ac59c665f34476a6b4': Docs: Training class on Identifying and Authenticating Users.
| | * | | | | | am f9cca66e: Docs: Training class on Identifying and Authenticating Users.Scott Main2011-12-154-0/+640
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1': Docs: Training class on Identifying and Authenticating Users.
| | | * | | | | Docs: Training class on Identifying and Authenticating Users.Scott Main2011-12-154-0/+640
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2005687ca3baf28d9e01be8c10ee0f6a58a3cc3
* | | | | | | | Merge "URL-decode tel: URIs."Victoria Lease2011-12-151-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | URL-decode tel: URIs.Victoria Lease2011-12-141-1/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 5688406 Change-Id: I2e3906c22d02b6333ccad7dba529d44ae572a368
* | | | | | | | Merge "Generate even fewer GL commands"Romain Guy2011-12-145-6/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Generate even fewer GL commandsRomain Guy2011-12-145-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f4dcacb03ef5ee7f6ebd501df98bfead5f0a7f8
* | | | | | | | | am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1Dianne Hackborn2011-12-141-9/+9
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '13299a33e14562a5de14c89ad058d28ab0cd9f37': Fix some java docs.
| * | | | | | | | am 399f1df3: Merge "Fix some java docs." into ics-mr1Dianne Hackborn2011-12-141-9/+9
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '399f1df38594ea8bc927ad23bfbde996a9dc161d': Fix some java docs.
| | * | | | | | | Merge "Fix some java docs." into ics-mr1Dianne Hackborn2011-12-141-9/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix some java docs.Dianne Hackborn2011-12-141-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0eeba6f9108db74418063fba522ed3ef1c27ae95
* | | | | | | | | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-145-81/+79
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix indentation and whitespaceGlenn Kasten2011-12-145-81/+79
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use git diff -w to verify. Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
* | | | | | | | | | Merge "Improve AudioFlinger error logging"Glenn Kasten2011-12-141-3/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve AudioFlinger error loggingGlenn Kasten2011-12-141-3/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ce9aff4038cd7fa0067600faa8080b137db1939
* | | | | | | | | | Merge "AudioMixer uninitialized simple fields"Glenn Kasten2011-12-141-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioMixer uninitialized simple fieldsGlenn Kasten2011-12-141-0/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I47e3849f048d4d990c9634f9c8a2ca2de0339e93
* | | | | | | | | | am 41d90f39: am 26bd66df: Merge "Doc change: add MR1 API summary and updated ↵Dirk Dougherty2011-12-145-13/+533
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | highlights." into ics-mr1 * commit '41d90f39a5c40e3036e15efef5b07789296c8bb9': Doc change: add MR1 API summary and updated highlights.
| * | | | | | | | am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." ↵Dirk Dougherty2011-12-145-13/+533
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '26bd66df4fc8caa7885fe3a4e78e379389a24a94': Doc change: add MR1 API summary and updated highlights.
| | * | | | | | | Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1Dirk Dougherty2011-12-145-13/+533
| | |\ \ \ \ \ \ \
| | | * | | | | | | Doc change: add MR1 API summary and updated highlights.Dirk Dougherty2011-12-145-13/+533
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a9b13b9c7b8ae3011772a62735c788762b45f7f
* | | | | | | | | | Merge "Audio C++ comments"Glenn Kasten2011-12-146-63/+59
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Audio C++ commentsGlenn Kasten2011-12-146-63/+59
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
* | | | | | | | | am b14436d0: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b14436d0700f6e837e4d6066ddcf672c61d7f033': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
| | * | | | | | | | Revert the following patches because they may lead to power regression ↵James Dong2011-12-147-84/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
* | | | | | | | | | Merge "Remove unnecessary this->"Glenn Kasten2011-12-141-15/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72038f5d4568f0633d3e4ab90f4b67e2dd22c332
* | | | | | | | | | Merge "Use const char correctly in AudioFlinger"Glenn Kasten2011-12-141-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use const char correctly in AudioFlingerGlenn Kasten2011-12-141-3/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use const char [] instead of const char * to eliminate unnecessary pointer. Make the array audio_interfaces also const, in addition to the strings. Change-Id: I31f33d1dcb9a657ee136f4280fd2d46492496831
* | | | | | | | | | Merge "Use units after all times"Glenn Kasten2011-12-141-10/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use units after all timesGlenn Kasten2011-12-141-10/+12
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48d3f29c37228b5d03189e4c9600824c9360cac9
* | | | | | | | | | Merge "Fix typo in error message, missing space"Glenn Kasten2011-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix typo in error message, missing spaceGlenn Kasten2011-12-141-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icdddbf2fddb81a1db538dd94fb25cf859e44bfbd
* | | | | | | | | | Merge "Delete obsolete includes"Glenn Kasten2011-12-141-6/+0
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-25 08:32:40 +0000