summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docsScott Main2014-04-011-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8b6feb2007259cdc4053a9774e31847ee60d592': laptop image with redacted
| | | * | | | | | | | | | | | | | | | | | | | am 35682006: Merge "laptop image with redacted" into klp-docsScott Main2014-04-011-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '356820063afa85c78dd7f7b9bce2b62169e490bc': laptop image with redacted
| | | | * | | | | | | | | | | | | | | | | | | Merge "laptop image with redacted" into klp-docsScott Main2014-04-011-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | laptop image with redactedScott Main2014-03-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89e6b37840757a53c38686a2cf69297e558ef6d0
* | | | | | | | | | | | | | | | | | | | | | | | am 402f2304: am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update ↵Scott Main2014-04-011-22/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for 4/1/14" into klp-docs * commit '402f23046c4a624527937b61926d65a9935a9b60': dashbaord update for 4/1/14
| * | | | | | | | | | | | | | | | | | | | | | | am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" ↵Scott Main2014-04-011-22/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit '3bd0a44bbf8de4dc1d190fffe91a10b8f1e2243f': dashbaord update for 4/1/14
| | * | | | | | | | | | | | | | | | | | | | | | am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docsScott Main2014-04-011-22/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7afd38f3021a15e0bd22674409c2cd6d83095c3': dashbaord update for 4/1/14
| | | * | | | | | | | | | | | | | | | | | | | | am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docsScott Main2014-04-011-22/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afdbb93446cdc9238bf327155646950ae80dbe4': dashbaord update for 4/1/14
| | | | * | | | | | | | | | | | | | | | | | | | Merge "dashbaord update for 4/1/14" into klp-docsScott Main2014-04-011-22/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | dashbaord update for 4/1/14Scott Main2014-04-011-22/+21
| | | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id38d8a448dc86afecc2e80dc6a5f4fdb26d7cc93
* | | | | | | | | | | | | | | | | | | | | | | am 3b7432d2: am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the ↵Ricardo Cervera2014-04-012-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document on building with Android Studio * commit '3b7432d2e4ddc9efda5cc38f9008d40d6b4ef951': docs: Renamed the document on building with Android Studio
| * | | | | | | | | | | | | | | | | | | | | | am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on ↵Ricardo Cervera2014-04-012-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | building with Android Studio * commit 'bb755da9f7a2a4d3ea103afbc2140901d28e8f74': docs: Renamed the document on building with Android Studio
| | * | | | | | | | | | | | | | | | | | | | | am c192cdd3: am cf96f815: docs: Renamed the document on building with ↵Ricardo Cervera2014-04-012-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android Studio * commit 'c192cdd3c4ad8696d5d77949984cf7e06445e051': docs: Renamed the document on building with Android Studio
| | | * | | | | | | | | | | | | | | | | | | | am cf96f815: docs: Renamed the document on building with Android StudioRicardo Cervera2014-04-012-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf96f815854b87f8a2304fbaf5030d574671e6e0': docs: Renamed the document on building with Android Studio
| | | | * | | | | | | | | | | | | | | | | | | docs: Renamed the document on building with Android StudioRicardo Cervera2014-04-012-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc2d3562f8d77b593e7a7bac61675a5b15fcd535
* | | | | | | | | | | | | | | | | | | | | | Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()"Lajos Molnar2014-04-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | MediaCodec: avoid silent array overflow in queueSecureInputBuffer()Lajos Molnar2014-03-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13006907 Change-Id: I7e1a1e37a677f8b2cf500e1cc52f4c2ff40fa470
* | | | | | | | | | | | | | | | | | | | | | | Handle bad package name arguments sensicallyChristopher Tate2014-04-011-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't blithly go ahead and assume package name arguments are non-null, and don't continue to do a bunch of work after an early failure on invalid non-null package names. Bug 13745101 Change-Id: I12ccae343066b39162dedeb46dc58869f55be0ba
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add stub getThemeAttributeId() to BridgeTypedArray"Deepanshu Gupta2014-04-011-8/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Add stub getThemeAttributeId() to BridgeTypedArrayDeepanshu Gupta2014-04-011-8/+15
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method is used to obtain theme attribute IDs for drawables for caching. The changeset also fixes some minor style issues found by code inspection. Change-Id: Ib5fe05511397b5ec7cb8e64f6b2769ec2c355f41
* | | | | | | | | | | | | | | | | | | | | | | Merge "Don't ignore return value of setAuxEffectSendLevel()"Glenn Kasten2014-04-012-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Don't ignore return value of setAuxEffectSendLevel()Glenn Kasten2014-04-012-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1383c913304430146e6f40d89df623dd0d582e50
* | | | | | | | | | | | | | | | | | | | | | | Merge "Initial implementation of USB Audio output."Paul McLean2014-04-016-8/+531
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Initial implementation of USB Audio output.Paul McLean2014-03-316-8/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7fbbe421285d628fa49591c6469ac50efec77ccf
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Quantum action bars, media route icon"Alan Viverette2014-04-0174-17/+293
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Quantum action bars, media route iconAlan Viverette2014-03-3174-17/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54dd35cc6183a06756834bc11233cd1c9c3a4e99
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Use memcpy_to_i16_from_u8 from audioutils instead of C loop"Glenn Kasten2014-04-012-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Use memcpy_to_i16_from_u8 from audioutils instead of C loopGlenn Kasten2014-03-282-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function may be optimized in the future, and it will make it easier to search for audio sample format-specific code when we need add support for more formats. Change-Id: Iad0585c35ddd2d12857164ed1effcce75f77920c
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Don't double prompt on booting encrypted device"Paul Lawrence2014-04-016-2/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Don't double prompt on booting encrypted devicePaul Lawrence2014-03-286-2/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vold will store password securely until KeyGuard requests it and hands it on to KeyStore. This is a revision of https://googleplex-android-review.git.corp.google.com/#/c/418123/ which was reverted. It had two bugs in LockSettingsService.checkVoldPassword. 1) We were not checking password for null, which caused an exception 2) checkPattern/checkPassword return true if there is no saved pattern or password. This leads to situations where we get true returned even when the password doesn't match. Call the correct one based on what is there, not what vold thinks ought to be there. Bug: 12990752 Change-Id: I05315753387b1e508de5aa79b5a68ad7315791d4
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix visitFieldInsn in layoutlib_create."Deepanshu Gupta2014-04-016-7/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Fix visitFieldInsn in layoutlib_create.Deepanshu Gupta2014-03-316-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug caused some classes to be missed when computing the dependencies of the existing classes. Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up two wifi javadoc comments"Brian Williammee2014-04-012-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Clean up two wifi javadoc commentsBrian Williammee2014-03-312-5/+3
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove references to TI drivers, and unnecessary uncertainty. Change-Id: I74a01357264338df7c513684c6c752d1edb4ea4d
* | | | | | | | | | | | | | | | | | | | | | | | | am a3e6f36f: (-s ours) am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am ↵Baligh Uddin2014-04-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc5e02bd: (-s ours) Import translations. DO NOT MERGE * commit 'a3e6f36f406f9e65dee1a404fc80b6cc96088776': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | | | | | am 8c3d3e82: (-s ours) am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import ↵Baligh Uddin2014-04-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '8c3d3e826932da75f5399baaf5bcbc3b1f3a9372': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | | | | | am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53b3d44f524c162a18ca91034c90ac9f7e62e561': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | | | | | | | | | | am dc5e02bd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | / / / / / / / / / / / / | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | * commit 'dc5e02bdccbbc60ede21ae706f06c696b6983812': Import translations. DO NOT MERGE
| | | | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-03-312-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | | am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb19fc61f28bcff1b129d1a60913f5b8722f10cf': Doc Update: revert PendingIntent fix.
| * | | | | | | | | | | | | | | | | | | | | | | am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d': Doc Update: revert PendingIntent fix.
| | * | | | | | | | | | | | | | | | | | | | | | am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753': Doc Update: revert PendingIntent fix.
| | | * | | | | | | | | | | | | | | | | | | | | Doc Update: revert PendingIntent fix.Katie McCormick2014-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original fix was in error. Reverting. See: b/10641568 Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug #13727850 Input values are not visible when setting up the ↵Fabrice Di Meglio2014-04-012-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lockscreen... ...security(PIN/Passwor/Pattern)."
| * | | | | | | | | | | | | | | | | | | | | | | Fix bug #13727850 Input values are not visible when setting up the lockscreen...Fabrice Di Meglio2014-03-312-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...security(PIN/Passwor/Pattern). - remove that hardcoded color - enable passing a color for the Path lines Change-Id: Ie40b15bf209f41ea2df16842a3e56ffc2020df65
* | | | | | | | | | | | | | | | | | | | | | | | Camera2: Fix missing capture result callback issueZhijun He2014-03-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring output right after submitting some capture request, the waitUntilIdle clears the capture mCaptureListenerMap and mRepeatingRequestIdDeletedList. This caused the listener is cleared before the capture result is delivered to application side. Since the listener is already removed properly, it is really not needed to clear them right after idling the device. It also doesn't make sense to add the repeating request id that has no listener hooked up to the mRepeatingRequestIdDeletedList, this caused out of sync between id deleted list and the mCaptureListenerMap for repeating request. Bug: 13730119 Change-Id: I94ab7a5515f841ffd97b103c2c1b71d92afd955a
* | | | | | | | | | | | | | | | | | | | | | | | am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL ↵Jason Sams2014-04-011-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setSurfaceTexture problem" * commit 'c796ccaafb935592b98d5aaad2594791935f6530': Fix RenderScriptGL setSurfaceTexture problem
| * | | | | | | | | | | | | | | | | | | | | | | am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"Jason Sams2014-04-011-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b': Fix RenderScriptGL setSurfaceTexture problem
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"Jason Sams2014-04-011-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046': Fix RenderScriptGL setSurfaceTexture problem
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix RenderScriptGL setSurfaceTexture problem"Jason Sams2014-03-311-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \