summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adds support for array string extra.Dale Hawkins2014-02-261-0/+11
| | | | | | | | Adds support for setting an array string extra on an intent when launching an activity/service. Allows inclusion of commas using an escape character. Change-Id: I8857f7d28d60b75ddc65dc47f345a77230d00467
* am 4fecd0ae: (-s ours) am 74a8b916: am 59ff85af: (-s ours) am 2729857d: (-s ↵Chris Craik2014-02-260-0/+0
|\ | | | | | | | | | | | | ours) Merge "Fix AOSP build - DO NOT MERGE" * commit '4fecd0aeeb9a76b55c234a24cfd5e1394c801348': Fix AOSP build - DO NOT MERGE
| * am 74a8b916: am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP ↵Chris Craik2014-02-260-0/+0
| |\ | | | | | | | | | | | | | | | | | | build - DO NOT MERGE" * commit '74a8b916aceb0b55a7fdfa63bd8267c50d952a28': Fix AOSP build - DO NOT MERGE
| | * am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT ↵Chris Craik2014-02-260-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | MERGE" * commit '59ff85af314e2984068943f5572ac40ef381edea': Fix AOSP build - DO NOT MERGE
| | | * am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE"Chris Craik2014-02-260-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '2729857df6c559b37248c96b78303b662212d14b': Fix AOSP build - DO NOT MERGE
| | | | * Merge "Fix AOSP build - DO NOT MERGE"Chris Craik2014-02-261-1/+1
| | | | |\
| | | | | * Fix AOSP build - DO NOT MERGEChris Craik2014-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42b420c2ce89ce364a2809b28b827964e6923fa1
* | | | | | am 328b7ee6: am aecb8c43: am 7b4cce68: am c3bac8a0: Merge "Fix graphics ↵Chris Craik2014-02-264-15/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corruption caused by HWUI caches" * commit '328b7ee6a2ba2dc8f162fa57dbafd4bfc89bb72e': Fix graphics corruption caused by HWUI caches
| * | | | | am aecb8c43: am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused ↵Chris Craik2014-02-264-15/+29
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by HWUI caches" * commit 'aecb8c43d0c6c3d2b55f88abeaa0e3197be59301': Fix graphics corruption caused by HWUI caches
| | * | | | am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-02-264-15/+29
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '7b4cce68853d8bcfce2b6bd7f999915063eb56d2': Fix graphics corruption caused by HWUI caches
| | | * | | am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-02-264-15/+29
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit 'c3bac8a096cc5661cf91c8c0aa9b7dd0fc099c5d': Fix graphics corruption caused by HWUI caches
| | | | * | Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-02-264-15/+29
| | | | |\ \ | | | | | |/
| | | | | * Fix graphics corruption caused by HWUI cachesSangkyu Lee2014-02-264-15/+29
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some caches(PatchCache, TextureCache, PathCache) for HWUI uses deferred removal for their cache entries even though actual resource objects are immediately freed by ResourceCache. For this reason, the uniqueness of a resource address in the caches is not guaranteed in specific cases. (Because malloc() can return the same address when malloc() and free() called very frequently.) So it can be possible the cache have two cache entries for two different resources but the same memory address. (Of course one of the resources is already freed.) It also can be possible mGarbage vector in PatchCache has duplicated addresses and this can lead to duplicated free blocks in the free block list and graphics corruption. (Deferred removal was implmeneted based on an assumption of unique resource addresses.) So this patch makes sure resource objects are freed after the resources are removed from the caches to guarantee the uniqueness of a resource address and prevent graphics corruption. Change-Id: I040f033a4fc783d2c4bc04b113589657c36fb15b Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
* | | | | Merge "Added support for WiFi frequency on WifiInfo (getter, settter, and ↵Felipe Leme2014-02-262-1/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | frequency constant). Bug: 12767819"
| * | | | | Added support for WiFi frequency on WifiInfo (getter, settter, and frequency ↵Felipe Leme2014-02-052-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant). Bug: 12767819 Change-Id: Ib4a03919d9100861e993c733b7e478dc93dffaae
* | | | | | Merge "Fix SDK build broken by ag/423985"Jeff Davidson2014-02-261-1/+1
|\ \ \ \ \ \
| * | | | | | Fix SDK build broken by ag/423985Jeff Davidson2014-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85480683531468b7a8a83749d9366f5cc334bd24
* | | | | | | Merge "Move Session apis to android.media.session"RoboErik2014-02-2622-85/+99
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move Session apis to android.media.sessionRoboErik2014-02-2522-85/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make it easier to distinguish the new apis from the old ones. Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
* | | | | | | Merge "Add --replace-version flag to aapt."Jeff Davidson2014-02-263-11/+45
|\ \ \ \ \ \ \
| * | | | | | | Add --replace-version flag to aapt.Jeff Davidson2014-02-253-11/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: we'd like to programmatically specify the version name/code (i.e. to include the build number from the build server). However, this means that we cannot specify version info in the AndroidManifest.xml file, as this takes precedence. Not doing so makes IDE use more difficult, as the IDE gets version code 0 and won't install over an existing non-IDE version unless you first force a downgrade to an IDE build from the command line. This flag allows us to specify a very high version code in the AndroidManifest.xml file, making IDE builds take precedence, while still allowing us to override this info when performing command-line (official) builds. Change-Id: I5d01048698af5c26bdf19066c6cd4eca1115112a
* | | | | | | | Revert "Change Activity Scene Transitions to be more automatic."George Mount2014-02-2616-591/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f10587faadb9080a7bf9991cbe04bac5525da482. Change-Id: I2785a3d2d6b667cad6d61dcbbc1c624161735fa4
* | | | | | | | Merge "Add support.multidex tests app for an update bug."Yohann Roussel2014-02-2621-0/+618
|\ \ \ \ \ \ \ \
| * | | | | | | | Add support.multidex tests app for an update bug.Yohann Roussel2014-02-2621-0/+618
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failing scenario is - install v1 - run - update to v2 - update to v3 - run last run was failing with initial multidex library versions because it's still running on v1 extracted secondary dex files. Change-Id: Id9811371fc70b0a4e9b49de913ee38d18699b21d
* | | | | | | | | Merge "Constrain starting sub row to list bounds"Alan Viverette2014-02-261-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Constrain starting sub row to list boundsAlan Viverette2014-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 13077653 Change-Id: Id01da055e8502b1447519666eb439d8480437c6c
* | | | | | | | | | Merge "Deal with apps known to LocalTransport backend but with no data"Christopher Tate2014-02-261-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Deal with apps known to LocalTransport backend but with no dataChristopher Tate2014-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An app might have backed something up and later deleted it, in which case it will have a directory in the LocalTransport bookkeeping but with no actual dataset. Skip these packages at restore time, since we know a priori that there will be nothing to do. Change-Id: I85853097bc65ed60e5efd217ee6553b50459e445
* | | | | | | | | | | Regen current.txt to fix incorrect id for requiredForProfileAmith Yamasani2014-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b3cf326070bffd78e3e30519495b062c81b3d52
* | | | | | | | | | | Merge "Add DatePickerDialog to layoutlib"Deepanshu Gupta2014-02-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add DatePickerDialog to layoutlibDeepanshu Gupta2014-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes android.app.DatePickerDialog in the layoutlib.jar Bug: http://b.android.com/28318 Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
* | | | | | | | | | | | Merge "Change Activity Scene Transitions to be more automatic."George Mount2014-02-2516-445/+590
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Change Activity Scene Transitions to be more automatic.George Mount2014-02-2516-445/+590
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared element transitions are enabled by default when the Window has a TransitionManager. Shared element location and size are captured and transferred to the target Activity. ActionBar is treated as a shared element. Change-Id: I0f22ea4e5cbe80254e848444e3f235cb742684f4
* | | | | | | | | | | | | Merge "Disable simple keyguard when notifications enabled."Jim Miller2014-02-251-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Disable simple keyguard when notifications enabled.Jim Miller2014-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling notifications on keyguard tripped keyguard into simple mode which isn't ready for prime-time. Disabled with variable. Fixes bug 13172958 Change-Id: Ia281b06d754cd62455010f9e31c0ee81e4937977
* | | | | | | | | | | | | Merge "Use pre-computed index to draw the shadow."ztenghui2014-02-2511-257/+256
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use pre-computed index to draw the shadow.ztenghui2014-02-2511-257/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also draw the umbra part as triangle fans instead of zig zag fashion. b/12840179 Change-Id: Iaa5d15e77351acdd71f076bd8f9bb2d4d2b92faf
* | | | | | | | | | | | | More battery stats.Dianne Hackborn2014-02-2517-49/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add events for sync. - Add more descriptive tags for wake events. - Fix battery reset. - Fix tracking of wifi data. Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
* | | | | | | | | | | | | am 97686e00: am 91df7766: am 42ec5035: Modify API to hide ActivityView.Craig Mautner2014-02-251-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97686e00233f6475bd4a5a48bc718fcf88bbf688': Modify API to hide ActivityView.
| * | | | | | | | | | | | am 91df7766: am 42ec5035: Modify API to hide ActivityView.Craig Mautner2014-02-251-18/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91df776654e5cf66e5115e0c46ecdbe19a55a0bc': Modify API to hide ActivityView.
| | * | | | | | | | | | | am 42ec5035: Modify API to hide ActivityView.Craig Mautner2014-02-251-18/+7
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42ec5035672fbfe701ddbf90dcc4390dab9188af': Modify API to hide ActivityView.
| | | * | | | | | | | | | | Modify API to hide ActivityView.Craig Mautner2014-02-251-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes build too. Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
* | | | | | | | | | | | | | Merge "Tabs -> spaces in frameworks/base."John Spurlock2014-02-2556-291/+291
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Tabs -> spaces in frameworks/base.John Spurlock2014-02-2556-291/+291
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
* | | | | | | | | | | | | | Fix NFC docs breakage.Martijn Coenen2014-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
* | | | | | | | | | | | | | Merge "Fix accessorychat test program"Mike Lockwood2014-02-252-1/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix accessorychat test programMike Lockwood2014-02-252-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib51b880f64b13e860721d594c900b45d5725b718
* | | | | | | | | | | | | | | Merge "Fix boot crash on devices defaulting to landscape."Dan Sandler2014-02-251-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix boot crash on devices defaulting to landscape.Dan Sandler2014-02-251-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is probably not what keyguard_simple_host_view should look like in landscape, but we need the resource. Bug: 13185323 Change-Id: Ib044db1f86510128d27ecf45546398c7c1b81aa4
* | | | | | | | | | | | | | | | am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and ↵Craig Mautner2014-02-259-43/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displays when done" into klp-modular-dev * commit 'c407ace3019c4e542654cf17fd04d9436d3f3436': Clean up activities and displays when done
generated by cgit v1.1 at 2024-06-28 10:07:02 +0000