summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Hide NonNull and Nullable.Tor Norbye2013-12-173-6/+4
| | | | | | | | These should not be used in app code; instead, we will add class-file retention versions of these to the support library. Change-Id: I13275bd28529f5da04d923688655be35c77dbb1c
* am 1ba5915d: am a759b3d2: am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add ↵Scott Main2013-12-173-29/+58
|\ | | | | | | | | | | | | new training course for Interaction and Engagement" into klp-docs * commit '1ba5915dd09675485d55536301fdd7d80a305504': add new training course for Interaction and Engagement
| * am a759b3d2: am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add new training ↵Scott Main2013-12-173-29/+58
| |\ | | | | | | | | | | | | | | | | | | course for Interaction and Engagement" into klp-docs * commit 'a759b3d2b4c822a735a3a023be9b484cc05e0b19': add new training course for Interaction and Engagement
| | * am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add new training course for ↵Scott Main2013-12-173-29/+58
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Interaction and Engagement" into klp-docs * commit '3fca61f073b89136396022d78f444d0a50c1a0d3': add new training course for Interaction and Engagement
| | | * am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and ↵Scott Main2013-12-163-29/+58
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Engagement" into klp-docs * commit '75b8b3e008589c0a02c27d5baa6b3314a020f505': add new training course for Interaction and Engagement
| | | | * am ed4b7faa: Merge "add new training course for Interaction and Engagement" ↵Scott Main2013-12-173-29/+58
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit 'ed4b7faa4c17d086233d0b3f86fe315ceee5778e': add new training course for Interaction and Engagement
| | | | | * Merge "add new training course for Interaction and Engagement" into klp-docsScott Main2013-12-173-29/+58
| | | | | |\
| | | | | | * add new training course for Interaction and EngagementScott Main2013-12-163-29/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8
* | | | | | | Merge "Fix stroke color in GradientState.initializeWithState()"Alan Viverette2013-12-171-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix stroke color in GradientState.initializeWithState()Alan Viverette2013-12-161-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 12175674 Change-Id: I084339fd3c31a9b49f5875c9d3bac8f50cd027ca
* | | | | | | | Merge "Fixing build breakage due to: c4d41755d73ffe85d179d42a4f0c993b49303145"Shishir Agrawal2013-12-172-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing build breakage due to: c4d41755d73ffe85d179d42a4f0c993b49303145Shishir Agrawal2013-12-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mismatched @param in javadoc. Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
* | | | | | | | | Merge "Use vertex assignment instead of manual copy"Chris Craik2013-12-171-36/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use vertex assignment instead of manual copyChris Craik2013-12-161-36/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36c806e3370abca61e5bf5064f0f1a776a9ce487
* | | | | | | | | | am 3b475fef: Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGECraig Mautner2013-12-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | | * commit '3b475fefa3b83ce49454936a0be3081753e3e8ad': Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
| * | | | | | | | Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGECraig Mautner2013-12-162-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord member frontOfTask was being set true incorrectly for the top activity. It should only be true for the bottom activity. This fix ensures that frontOfTask is always set correctly for all activities by consoldating it into one method. Fixes bug 12171535. Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
* | | | | | | | | Merge "Replace auto-create in findViewById() with explicit create() API"Alan Viverette2013-12-173-23/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace auto-create in findViewById() with explicit create() APIAlan Viverette2013-12-113-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib833cc23f4ae39b5d729db3d425faa7dfd5b3c4c
* | | | | | | | | | camera2: update java docs for metadata tag spec updateZhijun He2013-12-163-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Below tag spec java docs are updated: - android.control.mode - android.control.aeMode - android.control.afMode - android.control.awbMode Bug: 12135317 Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
* | | | | | | | | | Merge "Fix incorrect setting of TaskRecord.frontOfTask"Craig Mautner2013-12-172-36/+23
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix incorrect setting of TaskRecord.frontOfTaskCraig Mautner2013-12-162-36/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord member frontOfTask was being set true incorrectly for the top activity. It should only be true for the bottom activity. This fix ensures that frontOfTask is always set correctly for all activities by consoldating it into one method. Fixes bug 12171535. Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
* | | | | | | | | | Merge "Adding support for SIM communication from Android over logical channels."Shishir Agrawal2013-12-175-1/+121
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adding support for SIM communication from Android over logical channels.Shishir Agrawal2013-12-125-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the folowing commands in ITelephony.aidl and TelephonyManager: - iccOpenLogicalChannel - iccCloseLogicalChannel - iccTransmitApduLogicalChannel Also add a new SIM_COMMUNICATION permission (maked as dangerous) to control access to the above commands. Change-Id: I89c08adc6f9738907e3b547c749f3cc61f300710
* | | | | | | | | | | Merge "Create private properties on GLCanvas for experimentation with 3d"Chris Craik2013-12-177-22/+90
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Create private properties on GLCanvas for experimentation with 3dChris Craik2013-12-167-22/+90
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
* | | | | | | | | | Merge "Refactor display adjustments into their own utils class"Alan Viverette2013-12-162-208/+257
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor display adjustments into their own utils classAlan Viverette2013-12-162-208/+257
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iddc413d7841d44b00e06ed1c5a02d54eb60858df
* | | | | | | | | | Merge "Don't cast FastScroller adapter to BaseAdapter"Alan Viverette2013-12-161-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't cast FastScroller adapter to BaseAdapterAlan Viverette2013-12-131-4/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 12130253 Change-Id: I78864a4603599daf39829d33414202c43ca97aa9
* | | | | | | | | | am b8928b05: am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge ↵Trevor Johns2013-12-161-282/+287
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Docs: Clean up HCE dev guide" into klp-docs * commit 'b8928b05932f9592cfeeb9c3cdc96c4066de2d55': Docs: Clean up HCE dev guide
| * | | | | | | | | am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up ↵Trevor Johns2013-12-161-282/+287
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HCE dev guide" into klp-docs * commit '987ac90d60b8a0b5ae909ce80b5234c1e5c41068': Docs: Clean up HCE dev guide
| | * | | | | | | | am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" ↵Trevor Johns2013-12-161-282/+287
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit 'ed8d921a2e8feae859bb1899356a936eb84fe50f': Docs: Clean up HCE dev guide
| | | * | | | | | | am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docsTrevor Johns2013-12-161-282/+287
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eec66178668d22910d3889e62087b3797ebf6dd2': Docs: Clean up HCE dev guide
| | | | * | | | | | am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docsTrevor Johns2013-12-161-282/+287
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '73c1681b2f557dfba09a2e1a071dec190dd05e36': Docs: Clean up HCE dev guide
| | | | | * | | | | Merge "Docs: Clean up HCE dev guide" into klp-docsTrevor Johns2013-12-161-282/+287
| | | | | |\ \ \ \ \
| | | | | | * | | | | Docs: Clean up HCE dev guideTrevor Johns2013-12-161-282/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed various typos and minor errors in the HCE dev guide. Also added a note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER. Issue: 11991294 Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a Signed-off-by: Trevor Johns <trevorjohns@google.com>
* | | | | | | | | | | am 6b4cc772: am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo ↵Scott Main2013-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 12174614 * commit '6b4cc77248a9e093d5111636680a0c7f39428677': fix typo bug: 12174614
| * | | | | | | | | | am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614Scott Main2013-12-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '201c78745d093e0a13420a96647965ee1ccaf68f': fix typo bug: 12174614
| | * | | | | | | | | am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614Scott Main2013-12-161-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a1d3d50cf42db2778dd0e7833608d3293353395': fix typo bug: 12174614
| | | * | | | | | | | am 31647391: am c53b7aad: fix typo bug: 12174614Scott Main2013-12-161-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '316473915d6f41523c21d7077093c4071ebb4283': fix typo bug: 12174614
| | | | * | | | | | | am c53b7aad: fix typo bug: 12174614Scott Main2013-12-161-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c53b7aad505b9d3130ad56fe72989704015858a3': fix typo bug: 12174614
| | | | | * | | | | | fix typoScott Main2013-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 12174614 Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
* | | | | | | | | | | am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long ↵Elliott Hughes2013-12-164-29/+29
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for pointers in MediaDrm and MediaMuxer" * commit '3bfc6e76e627d4122a774488f36fb843bb3694fb': AArch64: Use long for pointers in MediaDrm and MediaMuxer
| * | | | | | | | | | am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers ↵Elliott Hughes2013-12-164-29/+29
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in MediaDrm and MediaMuxer" * commit 'c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894': AArch64: Use long for pointers in MediaDrm and MediaMuxer
| | * | | | | | | | | am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm ↵Elliott Hughes2013-12-164-29/+29
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and MediaMuxer" * commit 'a012fee3c31803799176f3efb75cf2f929eeb062': AArch64: Use long for pointers in MediaDrm and MediaMuxer
| | | * | | | | | | | am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-164-29/+29
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57': AArch64: Use long for pointers in MediaDrm and MediaMuxer
| | | | * \ \ \ \ \ \ \ Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-164-29/+29
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-104-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in MediaDrm and MediaMuxer classes, as native pointers can be 64-bit. Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | | | | | am 409b7c98: (-s ours) am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ↵Christopher Tate2013-12-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResTable_config::CONFIG_* typo (MCC vs MNC)" * commit '409b7c98b47cb7ece2760aa53730233f54946e46': Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
| * | | | | | | | | | | | am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* ↵Christopher Tate2013-12-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo (MCC vs MNC)" * commit '4275cae4084cff0e267d9e0d63b968aa0788909a': Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
generated by cgit v1.1 at 2025-08-05 00:20:07 +0000