OSDN Git Service
Julius D'souza [Wed, 12 Apr 2017 02:11:26 +0000 (02:11 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am:
9e3c9eeb96 am:
3c6d6f53f3
am:
6717748eff -s ours
Change-Id: I8ef6575486308872b5eaea54777b497dc3a00616
Julius D'souza [Wed, 12 Apr 2017 02:01:28 +0000 (02:01 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am:
9e3c9eeb96
am:
3c6d6f53f3
Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e
Julius D'souza [Wed, 12 Apr 2017 01:55:57 +0000 (01:55 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am:
9e3c9eeb96
Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b
Julia Reynolds [Wed, 12 Apr 2017 01:46:07 +0000 (01:46 +0000)]
Merge "Changing importance should record user locked field." into oc-dev
am:
f61985f02e
Change-Id: I8e53594947fd6bf1439da9c5d70e86cff111983b
Andreas Gampe [Wed, 12 Apr 2017 01:45:01 +0000 (01:45 +0000)]
Merge "OtaDexOptService: Log post-reboot moves" into oc-dev
am:
fac61e4928
Change-Id: Id9d427f5d101d7d99ef313fd3b1ede9776ae655d
Julius D'souza [Wed, 12 Apr 2017 01:41:38 +0000 (01:41 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:40:55 +0000 (01:40 +0000)]
Merge "Changing importance should record user locked field." into oc-dev
Andreas Gampe [Wed, 12 Apr 2017 01:36:31 +0000 (01:36 +0000)]
Merge "OtaDexOptService: Log post-reboot moves" into oc-dev
Julia Reynolds [Wed, 12 Apr 2017 01:31:03 +0000 (01:31 +0000)]
Merge "Allow companion device mgrs channel access" into oc-dev
am:
de99065a40
Change-Id: I7de72421e62670f69d2d85837868efe0ef019a0a
TreeHugger Robot [Wed, 12 Apr 2017 01:22:49 +0000 (01:22 +0000)]
Merge "Allow companion device mgrs channel access" into oc-dev
Bill Yi [Wed, 12 Apr 2017 01:18:04 +0000 (01:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
76be6a7a6b -s ours
Change-Id: Id57dcef4da9f9eac4f4eb8e8e88fcf37bd59588e
Conrad Chen [Wed, 12 Apr 2017 01:17:00 +0000 (01:17 +0000)]
Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
am:
307bec8572
Change-Id: I3550c39408739e0a3d1fce93cc35b09a3b77d70f
David Stevens [Wed, 12 Apr 2017 01:13:37 +0000 (01:13 +0000)]
Merge "Reset the default usb package less often" into oc-dev
am:
1654143680
Change-Id: I8c7986ed572aea065140999281c91424aade8f48
Bill Yi [Wed, 12 Apr 2017 01:12:24 +0000 (01:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
116c09f71d -s ours
Change-Id: Ied38bd3b8b0bf8a4f22bcc22af147664494c862a
TreeHugger Robot [Wed, 12 Apr 2017 01:07:28 +0000 (01:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Colin Cross [Wed, 12 Apr 2017 01:06:53 +0000 (01:06 +0000)]
Merge "Add missing transitive dependencies" into oc-dev
am:
3fa195c3cf
Change-Id: Ie1a88f1fa5fc857dbebc739b0a6f0a9de6e351eb
Colin Cross [Wed, 12 Apr 2017 01:01:44 +0000 (01:01 +0000)]
Merge "Update layoutlib to match java library changes" into oc-dev
am:
d88676f363
Change-Id: I7fd70578991b1c26a868d4cf856a41b2a69b1319
Mathieu Chartier [Wed, 12 Apr 2017 00:27:56 +0000 (00:27 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am:
d269f30d62 am:
f62b12ae31
am:
540bc2d94e
Change-Id: Ibb9428212a374a9e7050fcb4358dd896604d2982
Conrad Chen [Wed, 12 Apr 2017 00:25:33 +0000 (00:25 +0000)]
Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
Mathieu Chartier [Wed, 12 Apr 2017 00:20:23 +0000 (00:20 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am:
d269f30d62
am:
f62b12ae31
Change-Id: I002c55618a647e4ab17fff50f89b04df3e492e9e
Roozbeh Pournader [Wed, 12 Apr 2017 00:14:26 +0000 (00:14 +0000)]
Merge "Keep spans while transforming to uppercase" into oc-dev
am:
cd3f72d628
Change-Id: Ie93ae0764c46883c46f5d4f5a8996d57aa143b7e
David Stevens [Wed, 12 Apr 2017 00:12:11 +0000 (00:12 +0000)]
Merge "Reset the default usb package less often" into oc-dev
Evan Rosky [Wed, 12 Apr 2017 00:11:54 +0000 (00:11 +0000)]
Merge "Make AdapterView auto-focusable-aware" into oc-dev
am:
7d6bf45428
Change-Id: I1f44573ac5aa04c097f7d93298e27d99c54c6ce8
Mathieu Chartier [Wed, 12 Apr 2017 00:09:47 +0000 (00:09 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
am:
d269f30d62
Change-Id: I2830356fd9288feef334e19a1281c720c6fd7fca
TreeHugger Robot [Wed, 12 Apr 2017 00:07:29 +0000 (00:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Colin Cross [Wed, 12 Apr 2017 00:06:02 +0000 (00:06 +0000)]
Merge "Add missing transitive dependencies" into oc-dev
Colin Cross [Wed, 12 Apr 2017 00:04:55 +0000 (00:04 +0000)]
Merge "Update layoutlib to match java library changes" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 00:02:32 +0000 (00:02 +0000)]
Merge "Keep spans while transforming to uppercase" into oc-dev
Evan Rosky [Wed, 12 Apr 2017 00:02:21 +0000 (00:02 +0000)]
Merge "Make AdapterView auto-focusable-aware" into oc-dev
Jorim Jaggi [Wed, 12 Apr 2017 00:01:41 +0000 (00:01 +0000)]
Merge "Improve caching behavior of thumbnails" into oc-dev
am:
b67e105e74
Change-Id: I48914589de80ca11c97919bb5af6903ae46d2b3f
Jason Monk [Wed, 12 Apr 2017 00:00:32 +0000 (00:00 +0000)]
Merge "Clean up activity a bit and disable it by default" into oc-dev
am:
1df5ca5911
Change-Id: Idb7475a6715e8cc5d4f2c9e2e418d4cedd7d9c10
Treehugger Robot [Tue, 11 Apr 2017 23:59:28 +0000 (23:59 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
Wale Ogunwale [Tue, 11 Apr 2017 23:59:22 +0000 (23:59 +0000)]
Merge "Ensure visible activities when device is unlocked." into oc-dev
am:
293afb3917
Change-Id: I7e8827cdc75212223fa9e42852f8505dbebee8eb
TreeHugger Robot [Tue, 11 Apr 2017 23:53:14 +0000 (23:53 +0000)]
Merge "Improve caching behavior of thumbnails" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:51:48 +0000 (23:51 +0000)]
Merge "Clean up activity a bit and disable it by default" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:50:07 +0000 (23:50 +0000)]
Merge "Ensure visible activities when device is unlocked." into oc-dev
Mark Salyzyn [Tue, 11 Apr 2017 23:44:04 +0000 (23:44 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit" am:
cf39eea407 am:
5f98be7f11
am:
3da7584dc4
Change-Id: I2fd96c0c9cae8043bb5fabaa32b542b6965abcf7
Mark Salyzyn [Tue, 11 Apr 2017 23:33:22 +0000 (23:33 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit" am:
cf39eea407
am:
5f98be7f11
Change-Id: I4997e6f310c08cd0cf094a04685859b2853f8a05
Mark Salyzyn [Tue, 11 Apr 2017 23:25:06 +0000 (23:25 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit"
am:
cf39eea407
Change-Id: I225add287a014fa8e2623d1e61456a5c523d5377
Jeff Sharkey [Tue, 11 Apr 2017 23:21:20 +0000 (23:21 +0000)]
Merge "Grant Shell ability to clear cached app data." into oc-dev
am:
1f58ad1a2f
Change-Id: Ieb4f37b861b9fd5a49d30d607de5589a355aa67d
Brad Ebinger [Tue, 11 Apr 2017 23:20:16 +0000 (23:20 +0000)]
Merge "Move @SystemApi access to ImsService" into oc-dev
am:
509a311976
Change-Id: I98a548a4a7f2df635d8132a93948ece3fb70be0a
TreeHugger Robot [Tue, 11 Apr 2017 23:15:32 +0000 (23:15 +0000)]
Merge "Grant Shell ability to clear cached app data." into oc-dev
Mark Salyzyn [Tue, 11 Apr 2017 23:13:06 +0000 (23:13 +0000)]
Merge "jni: isLoggable: adapt to removal of property name size limit"
Brad Ebinger [Tue, 11 Apr 2017 23:12:07 +0000 (23:12 +0000)]
Merge "Move @SystemApi access to ImsService" into oc-dev
Geoffrey Pitsch [Tue, 11 Apr 2017 23:09:20 +0000 (23:09 +0000)]
Merge "Toast whenever a notification fails to post" into oc-dev
am:
b287e9907a
Change-Id: Idf8e29922f1192e258dd4c76172b3dfd36f6347b
TreeHugger Robot [Tue, 11 Apr 2017 22:59:59 +0000 (22:59 +0000)]
Merge "Toast whenever a notification fails to post" into oc-dev
Bill Yi [Tue, 11 Apr 2017 22:49:17 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
6acaa0382c -s ours
Change-Id: Icf19e23bddfdd2d1bd2865d3909e9ae42d767127
TreeHugger Robot [Tue, 11 Apr 2017 22:35:45 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Tue, 11 Apr 2017 22:34:18 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
911de0346c -s ours
Change-Id: Iceda0abfce015f3fec2379a6202015de1996f26b
TreeHugger Robot [Tue, 11 Apr 2017 22:28:39 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Amit Mahajan [Tue, 11 Apr 2017 21:50:19 +0000 (21:50 +0000)]
Merge "Add p2 option in openLogicalChannel." am:
f954f2d5cc am:
7c6fa75512
am:
9c113787a4
Change-Id: Iad26507830edceb39433766d7b6e3f0bb708c0e2
Amit Mahajan [Tue, 11 Apr 2017 21:44:00 +0000 (21:44 +0000)]
Merge "Add p2 option in openLogicalChannel." am:
f954f2d5cc
am:
7c6fa75512
Change-Id: Iee6b5873353ea10262c9268989cbe5c2fd946cc7
Amit Mahajan [Tue, 11 Apr 2017 21:34:51 +0000 (21:34 +0000)]
Merge "Add p2 option in openLogicalChannel."
am:
f954f2d5cc
Change-Id: I3437793f39ba6747554fec383ac7ab9f88df9266
Amit Mahajan [Tue, 11 Apr 2017 21:25:41 +0000 (21:25 +0000)]
Merge "Add p2 option in openLogicalChannel."
Jaekyun Seok [Tue, 11 Apr 2017 21:17:17 +0000 (21:17 +0000)]
Merge "Bring back the priority feature for static RRO" into oc-dev
am:
8f8a71d170
Change-Id: I6812e2617a030a33158d7f859404da2f5e9fde66
Jaekyun Seok [Tue, 11 Apr 2017 21:16:04 +0000 (21:16 +0000)]
Merge "Rebase enabled overlays for every PackageParser.generateActivityInfo() call" into oc-dev
am:
ad724f61ad
Change-Id: I396870c82c6cdb1e4b709ff17cc1de4f62492a0a
Nathan Harold [Tue, 11 Apr 2017 21:06:52 +0000 (21:06 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()" into oc-dev
am:
4e745fd4e9
Change-Id: I6481b6eeb269d749355e07625118b2cada3b9f33
Jorim Jaggi [Mon, 3 Apr 2017 15:24:19 +0000 (17:24 +0200)]
Improve caching behavior of thumbnails
Remove the retrieval cache on system_server. It's not needed at
this point.
Instead, we cache the low-res thumbnails on SystemUI side that
will be visible when recents launches. For that, we introduce
a strong thumbnail cache, which gets filled up whenever the task
stack changes.
Also fix a couple of issues like that the visibility report was
pretty wrong as well as some tasks got unloaded because tasks were
bound before layout happend.
Also fix a merge issue where we didn't load the reduced resolution
thumbnail :/
Test: TaskSnapshotCacheTest
Test: Open a couple of apps, open recents, make sure all
thumbnails are already loaded.
Fixes:
36374895
Change-Id: Idbf1acd4ceab6a7c4656e9791e245a8b102017f2
TreeHugger Robot [Tue, 11 Apr 2017 21:02:55 +0000 (21:02 +0000)]
Merge "Bring back the priority feature for static RRO" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 21:02:24 +0000 (21:02 +0000)]
Merge "Rebase enabled overlays for every PackageParser.generateActivityInfo() call" into oc-dev
Nathan Harold [Tue, 11 Apr 2017 20:58:29 +0000 (20:58 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()" into oc-dev
Mathieu Chartier [Tue, 11 Apr 2017 20:55:11 +0000 (20:55 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" into oc-dev
am:
bfd70fb90b
Change-Id: I9b8f53db81339493d44a29aa711940a5f0142b67
Mathieu Chartier [Tue, 11 Apr 2017 01:28:03 +0000 (18:28 -0700)]
Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING
dalvik-data-code-cache and dalvik-CompilerMetadata should be counted
in JITCache instead of .GC in dumpsys.
Bug:
37224159
Test: adb shell dumpsys meminfo -d
(cherry picked from commit
874c4cf56c0a9ea3b48468a13ec7fb78a3e2594b)
Change-Id: I41def949d91b2fdef0b3f502fe16ae436d058051
TreeHugger Robot [Tue, 11 Apr 2017 20:49:47 +0000 (20:49 +0000)]
Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" into oc-dev
Roozbeh Pournader [Thu, 6 Apr 2017 01:26:17 +0000 (18:26 -0700)]
Keep spans while transforming to uppercase
We now use ICU's new functionality for casing edits to preserve
the spans while applying AllCapsTransformationMethod.
Test: Manual
Test: CTS tests added and pass
Bug:
7198872
Bug:
19047649
Bug:
19713814
Bug:
34853618
Bug: https://code.google.com/p/android/issues/detail?id=67509
Change-Id: I0df388e79894961efb272d497f1dcc0570a6c085
Adrian Roos [Tue, 11 Apr 2017 20:35:13 +0000 (20:35 +0000)]
Merge "Revert "AOD: Wake up fully on gestures by default"" into oc-dev
am:
e76f4b0d0b
Change-Id: I5e699e5a290a3ff3baa944a5490e134fda860538
Adrian Roos [Tue, 11 Apr 2017 20:25:54 +0000 (20:25 +0000)]
Merge "Revert "AOD: Wake up fully on gestures by default"" into oc-dev
Fabrice de Gans-Riberi [Tue, 11 Apr 2017 20:11:40 +0000 (20:11 +0000)]
Merge "AAPT2: expose return values through JNI." into oc-dev
am:
3f1febbedb
Change-Id: I2d145aaeb975dfa6abc34f1d5c4e0e9a5708a8b4
Jakub Pawlowski [Tue, 11 Apr 2017 20:01:46 +0000 (20:01 +0000)]
Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev
am:
2d7d617e6a
Change-Id: I1c71f18c7d2c204fac96c047de3bda7759608997
Jakub Pawlowski [Tue, 11 Apr 2017 20:00:34 +0000 (20:00 +0000)]
Bluetooth 5 fix default AdvertisingSetParameters values
am:
1ab569d43f
Change-Id: I84333cc09b61ebbdf306663966e27e6b42556b85
Jakub Pawlowski [Tue, 11 Apr 2017 19:59:29 +0000 (19:59 +0000)]
Bluetooth: fix comment wording
am:
5203f76933 -s ours
Change-Id: I7f16614f63b5f0404c64dce4c4c65c91aba7e902
Fabrice de Gans-Riberi [Tue, 11 Apr 2017 19:56:15 +0000 (19:56 +0000)]
Merge "AAPT2: expose return values through JNI." into oc-dev
Bill Yi [Tue, 11 Apr 2017 19:41:05 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31705e9dbbd23f7e57892e12372a472c903df55e
Auto-generated-cl: translation import
Svetoslav Ganov [Tue, 11 Apr 2017 19:35:51 +0000 (19:35 +0000)]
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
am:
c62250ad52
Change-Id: I92b682ac25bd6460a0e10237faf6aed081b6c3c6
Android Build Merger (Role) [Tue, 11 Apr 2017 19:22:12 +0000 (19:22 +0000)]
Merge changes into oc-dev-plus-aosp
Jack Yu [Tue, 11 Apr 2017 19:21:19 +0000 (19:21 +0000)]
Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev
am:
4011fff255
Change-Id: Ia233a19c30a880ea5631ae37ba0d91d91f49abfa
Jakub Pawlowski [Tue, 11 Apr 2017 19:19:32 +0000 (19:19 +0000)]
Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev
* changes:
Remove enable from PeriodicAdvertisingPariameters (1/2)
Bluetooth 5 fix default AdvertisingSetParameters values
Bluetooth: fix comment wording
Julia Reynolds [Tue, 4 Apr 2017 21:04:38 +0000 (17:04 -0400)]
Allow companion device mgrs channel access
- Callbacks when channels and groups are modified
- Allow them to read and update channels and groups
Test: runtest systemui-notification
Change-Id: Ie4d02bd4583f71f9faf27603bcc59a1ec0eeaf46
Jeff Sharkey [Mon, 10 Apr 2017 03:37:56 +0000 (21:37 -0600)]
Grant Shell ability to clear cached app data.
It already has CLEAR_APP_USER_DATA to clear everything inside app
storage, and clearing cached data is a subset of that.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug:
36731175
Change-Id: Iefc5be6c80e2562a95424fd6fe413bdb018201a9
Conrad Chen [Thu, 6 Apr 2017 00:31:01 +0000 (17:31 -0700)]
TIF: add TvInputManager methods to notify apps
Adds TvInputManager methods to notify apps with protected broadcasts
for:
1. Disabling browsable state of preview and watch next programs.
2. Adding preview programs to watch next programs.
Test: build and verify manually to check if notifications are
broadcasted.
Bug:
35881266
Change-Id: I20fd5b63f42b2c74277315bbbd251b71c649e5c1
Svetoslav Ganov [Tue, 11 Apr 2017 18:58:50 +0000 (18:58 +0000)]
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
Jason Monk [Tue, 11 Apr 2017 18:55:25 +0000 (14:55 -0400)]
Clean up activity a bit and disable it by default
Test: visual & demo mode
Change-Id: I3718e7f58d21a28ae937064882c4edff10534701
Fixes:
36020978
Tyler Gunn [Tue, 11 Apr 2017 18:54:59 +0000 (18:54 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev
am:
76679ead10
Change-Id: I80192d01e464e36dc413587d4f776a12a57eba69
Adam Lesinski [Tue, 11 Apr 2017 18:49:45 +0000 (18:49 +0000)]
Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev
am:
fa7b34395c
Change-Id: I971b67d5e73b3a45e629212e6a9161c74cff5c72
Jack Yu [Tue, 11 Apr 2017 18:45:31 +0000 (18:45 +0000)]
Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev
Bill Yi [Tue, 11 Apr 2017 18:41:51 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00ba119096a1178627988e15ec6e71f637b2ac57
Auto-generated-cl: translation import
Svet Ganov [Tue, 11 Apr 2017 18:40:14 +0000 (11:40 -0700)]
Keep a removed API to not break GCore presubmit
Change-Id: Ica38b7aad2a5a8792917d0da1d497f373b118077
Tyler Gunn [Tue, 11 Apr 2017 18:36:55 +0000 (18:36 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev
Jorim Jaggi [Tue, 11 Apr 2017 18:30:18 +0000 (18:30 +0000)]
Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev
am:
971fe468a4
Change-Id: Id22f93bb9250f587c678a401fa57507784a58ebc
Adam Lesinski [Tue, 11 Apr 2017 18:29:56 +0000 (18:29 +0000)]
Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev
Todd Kennedy [Tue, 11 Apr 2017 18:29:02 +0000 (18:29 +0000)]
Merge "add debug logs" into oc-dev
am:
7fa473b1aa
Change-Id: I1ea353968caff9d4e1ce2ef56267a40e3801be14
Bill Yi [Tue, 11 Apr 2017 18:28:05 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20af9c4b4177a5a36496e76c70870b4792944f2c
Auto-generated-cl: translation import
Bill Yi [Tue, 11 Apr 2017 18:20:51 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I12715892d9848e7a1efac7a7cd990baad91ad550
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 11 Apr 2017 18:15:54 +0000 (18:15 +0000)]
Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev
Todd Kennedy [Tue, 11 Apr 2017 18:14:18 +0000 (18:14 +0000)]
Merge "add debug logs" into oc-dev
Wale Ogunwale [Mon, 10 Apr 2017 16:50:21 +0000 (09:50 -0700)]
Ensure visible activities when device is unlocked.
When the device is locked we transition all activities to the stopped
state. However, we were only resuming the activity in the focused stack
when the device is unlocked. We now:
- Ensure all visible acitvities when the device is unlocked regardless
of stack.
- If the activity is marked as visible, but in the STOPPED state, we go
ahead and restart it.
- Correctly set ActivityRecord.stopped to false when we restart an
activity into the PAUSED state.
Fixes:
37119770
Bug:
37244415
Test: Make sure docked activity state isn't STOPPED when device is
unlocked.
Change-Id: I1498eeddaa3c1f5dd5135dca56271ffc22b704f2
Makoto Onuki [Tue, 11 Apr 2017 18:11:20 +0000 (18:11 +0000)]
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev
am:
a2ea59c9bb
Change-Id: Ic9eebe67290f7dcd7ff59bb40c81d39bf2a8d82d
Bill Yi [Tue, 11 Apr 2017 18:09:45 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e62e9a274a -s ours
Change-Id: Ib0cef189f301d3a79b75aa610994dc59d441ab81
Mathieu Chartier [Tue, 11 Apr 2017 01:28:03 +0000 (18:28 -0700)]
Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING
dalvik-data-code-cache and dalvik-CompilerMetadata should be counted
in JITCache instead of .GC in dumpsys.
Bug:
37224159
Test: adb shell dumpsys meminfo -d
(cherry picked from commit
874c4cf56c0a9ea3b48468a13ec7fb78a3e2594b)
Change-Id: I41def949d91b2fdef0b3f502fe16ae436d058051
Roozbeh Pournader [Tue, 11 Apr 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Update fontchain_lint to test new emoji font" into oc-dev
am:
f72b0eec6e
Change-Id: Ie4e8d0621e8b5d133248f457c3a734ef035d7b80
OSDN Git Service
