OSDN Git Service
Beverly Tai [Thu, 19 Oct 2017 03:34:46 +0000 (03:34 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97 am:
93d9ac257d -s ours
am:
1ce0456b99
Change-Id: I9650a76a4f2dacb2c37e8232409e03c8745383f7
Siyamed Sinir [Thu, 19 Oct 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04 am:
685b515140
am:
65f1a4c4c2
Change-Id: I97965f18ce2146b65542ef8c2125c88c024c67c8
TreeHugger Robot [Thu, 19 Oct 2017 03:16:48 +0000 (03:16 +0000)]
Merge "Preserve ranking attrs of resolve infos for installing a feature split" into oc-mr1-dev
Beverly Tai [Thu, 19 Oct 2017 03:06:40 +0000 (03:06 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97
am:
93d9ac257d -s ours
Change-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6
Siyamed Sinir [Thu, 19 Oct 2017 03:00:17 +0000 (03:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04
am:
685b515140
Change-Id: I42139be71b55e6a9a7c88b97cd99936216541cc3
Beverly Tai [Thu, 19 Oct 2017 02:59:41 +0000 (02:59 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a
am:
b00fd6bb97
Change-Id: Ie1ed5edaabe4cf6206764c0f343a70eb588009c5
Siyamed Sinir [Thu, 19 Oct 2017 02:49:27 +0000 (02:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5
am:
8621a28b04
Change-Id: Ifac3ab83e23f93d8f0834029b44ec8f32bbab243
Beverly Tai [Thu, 19 Oct 2017 02:48:23 +0000 (02:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed
am:
7fd4bec14a
Change-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f
Siyamed Sinir [Thu, 19 Oct 2017 02:37:50 +0000 (02:37 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841
am:
9950579eb5
Change-Id: I9019cab591a3729592ddd142867f6b3f0c40c369
Beverly Tai [Thu, 19 Oct 2017 02:37:19 +0000 (02:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3
am:
c6ca9254ed
Change-Id: I8715d787f890827442c098b7ef5c93c563e4246e
Siyamed Sinir [Thu, 19 Oct 2017 02:26:01 +0000 (02:26 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c
am:
19a3c53841
Change-Id: I20e8fba8fe69c10c5cbdd1a1d3db27a20a206e51
Beverly Tai [Thu, 19 Oct 2017 02:25:35 +0000 (02:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours
am:
f1a95220a3
Change-Id: Icccff07eedee53fdc20c40d62e41b40af0b4992f
Suprabh Shukla [Thu, 19 Oct 2017 02:16:29 +0000 (02:16 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964 am:
f580b0f6a4
am:
2bded32359
Change-Id: I61b5f44bbddc391303dfec7e64895d83c588f7f8
Siyamed Sinir [Thu, 19 Oct 2017 02:12:01 +0000 (02:12 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa
am:
69cc90b01c
Change-Id: Ia0630be45dfa4778b204585002c299c847d32366
Beverly Tai [Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714
am:
9b0a6a3509 -s ours
Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5
Beverly Tai [Thu, 19 Oct 2017 02:03:19 +0000 (02:03 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d
am:
d34366e714
Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81
Suprabh Shukla [Thu, 19 Oct 2017 01:59:51 +0000 (01:59 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7 am:
a9e9e83964
am:
f580b0f6a4
Change-Id: Ie647ac50b0d312df13a163005c2a7bbfd8a4a26e
Siyamed Sinir [Thu, 19 Oct 2017 01:58:22 +0000 (01:58 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006
am:
2bab19f9aa
Change-Id: I3ee3147762e5ad8d72f4478d87800a35639228e0
Siyamed Sinir [Thu, 19 Oct 2017 01:49:20 +0000 (01:49 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0
am:
c26e04b006
Change-Id: Iade150e6e33a8ac095941e55c5871215bf54fe2d
Beverly Tai [Thu, 19 Oct 2017 01:48:33 +0000 (01:48 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966
am:
3d600ede6d
Change-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3
Suprabh Shukla [Thu, 19 Oct 2017 01:44:47 +0000 (01:44 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a am:
9ecbe6f6e7
am:
a9e9e83964
Change-Id: I97ab1af2f24b3773cb879f13d00fb1df0177f3fc
Siyamed Sinir [Thu, 19 Oct 2017 01:39:57 +0000 (01:39 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe
am:
b24023a7e0
Change-Id: If0f97db33c9f48c13c5f97c313807e8aab25a16b
Beverly Tai [Thu, 19 Oct 2017 01:38:56 +0000 (01:38 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours
am:
01ae445966
Change-Id: Ia2dff6ee69c4c7f10413aa98ba17ca717cb492d2
Suprabh Shukla [Thu, 19 Oct 2017 01:30:27 +0000 (01:30 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3 am:
d1e7db9f4a
am:
9ecbe6f6e7
Change-Id: I6c55e7667d23c638f16bd4bd5c62f9f706542154
Siyamed Sinir [Thu, 19 Oct 2017 01:30:16 +0000 (01:30 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours
am:
dcdb0e6bbe
Change-Id: I245194dbfd5da9eb5f5d13977b12b5dde39c1bb2
Beverly Tai [Thu, 19 Oct 2017 01:23:57 +0000 (01:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours
am:
3ca0cc0ae6 -s ours
Change-Id: Id5662a7d789e3e17e365d99b439cc8e8ab5d1c37
Siyamed Sinir [Thu, 19 Oct 2017 01:20:25 +0000 (01:20 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0
am:
4973227cbf -s ours
Change-Id: I9f53bf5a896885860e204764a8a282f77eff50cd
Suprabh Shukla [Thu, 19 Oct 2017 01:18:27 +0000 (01:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba am:
4e61bdb7d3
am:
d1e7db9f4a
Change-Id: Ia7824e38f4b5d92d09577e30a20a72bdf513534f
Suprabh Shukla [Thu, 19 Oct 2017 01:07:40 +0000 (01:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da am:
f0d00e51ba
am:
4e61bdb7d3
Change-Id: I6baddf0fcdcdd5a1236f69f5b19c67aa1e35b3c2
Suprabh Shukla [Thu, 19 Oct 2017 00:57:00 +0000 (00:57 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c am:
cf16ef09da
am:
f0d00e51ba
Change-Id: I4e775fd5b0c2ad74e92ef84ac1b1e2f307d6b54e
Suprabh Shukla [Thu, 19 Oct 2017 00:47:30 +0000 (00:47 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958 am:
57bbf9bb9c
am:
cf16ef09da
Change-Id: I82ed951a2f528dab65b95332db48a865b3fe9296
Suprabh Shukla [Thu, 19 Oct 2017 00:37:28 +0000 (00:37 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2 am:
2d194e5958
am:
57bbf9bb9c
Change-Id: Ia3f528efeaca69830c1a858e6c4637690c70062a
Svet Ganov [Thu, 19 Oct 2017 00:12:17 +0000 (17:12 -0700)]
Preserve ranking attrs of resolve infos for installing a feature split
If an intent resolves to an activity in a fearture split not on the device
we create a synthetic resolve info to involve the installer that replaces
the resolve info for the missing activity. The synthetic resolve info was
not inheriting the priority/preferred order/default status resulting in a
different result ranking than what original resolve info would produce,
hence affecting resolution. Activities in a feature split should resolve
as if they are present on the device.
Also when downloading a feature split we involve the instant app installer
which resuls in a disabmiguation UI item "Instant app" with an instant app
icon despite that in this case the synthetic resolve info is for downloading
a piece of an already installed app (standard or instant). When installing
a feature spluit the user should see UI as if the piece of the app would
handle the intent.
Test: manual
bug:
67710878
Change-Id: I8dd356c7b2c9742144f10e5b48daf5b28f6934ad
Suprabh Shukla [Thu, 19 Oct 2017 00:28:13 +0000 (00:28 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours am:
d2455f8fa2
am:
2d194e5958
Change-Id: I669966eb694623fe3052db84dd1dc6375e1bfde9
Suprabh Shukla [Thu, 19 Oct 2017 00:18:17 +0000 (00:18 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448 am:
0597a93629 -s ours
am:
d2455f8fa2
Change-Id: I20c7da32465a525b0a0bcd21f862a0a49cf727cb
Suprabh Shukla [Thu, 19 Oct 2017 00:07:54 +0000 (00:07 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts" am:
4a9d358448
am:
0597a93629 -s ours
Change-Id: I08d261935eb00ae8e8a929ff9ab54f6ec48fac88
TreeHugger Robot [Wed, 18 Oct 2017 23:56:55 +0000 (23:56 +0000)]
Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev
Makoto Onuki [Wed, 18 Oct 2017 19:52:45 +0000 (12:52 -0700)]
DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with...
... no activities.
Bug
67931644
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Change-Id: Icea651cf7880c5389467285e9cae3a52c4993669
Adam Lesinski [Wed, 18 Oct 2017 22:07:33 +0000 (15:07 -0700)]
AAPT2: Ensure strings are sorted by configuration
Keep strings sorted by configuration so that strings likely
to be selected (all match the same locale, for instance) are
close together.
Bug:
67958501
Test: make aapt2_tests
Change-Id: Id17d93bf2e03ce408a6f619d3ea6dc313e393b76
Suprabh Shukla [Wed, 18 Oct 2017 21:28:40 +0000 (21:28 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours am:
174d0688cc -s ours
am:
93f47a8662 -s ours
Change-Id: I6acd44dfe291b529fd5388aeae3cfbb32e3a5c36
Suprabh Shukla [Wed, 18 Oct 2017 21:06:57 +0000 (21:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours am:
976b873b98 -s ours
am:
174d0688cc -s ours
Change-Id: Ia0a5c8824afc1bb32179a8770386a84ba60a9034
Suprabh Shukla [Wed, 18 Oct 2017 20:34:12 +0000 (20:34 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours am:
28a1dd26e8 -s ours
am:
976b873b98 -s ours
Change-Id: Idc5e6178ac016e8047e34b98249eefb63dcf830c
Suprabh Shukla [Wed, 18 Oct 2017 20:19:08 +0000 (20:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours am:
9913314caf -s ours
am:
28a1dd26e8 -s ours
Change-Id: If444060396d2b80c4073ac2c9fd2c4dcb1129590
Suprabh Shukla [Wed, 18 Oct 2017 20:05:12 +0000 (20:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours am:
f0f1b1fe9e -s ours
am:
9913314caf -s ours
Change-Id: I5acc3db78fd84503b35aaa61539b1c6922e64465
Suprabh Shukla [Wed, 18 Oct 2017 19:43:57 +0000 (19:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours am:
17f0e4bc00 -s ours
am:
f0f1b1fe9e -s ours
Change-Id: I8ecb93fa4fa973ea6ee4694e1cd458b353a44bac
Suprabh Shukla [Wed, 18 Oct 2017 19:17:53 +0000 (19:17 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours am:
62dbcc9af0 -s ours
am:
17f0e4bc00 -s ours
Change-Id: I6dafcb8d51f40d157c2d6efbb41012d19c7eb1d2
Suprabh Shukla [Wed, 18 Oct 2017 19:05:08 +0000 (19:05 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours am:
88f4c765a6 -s ours
am:
62dbcc9af0 -s ours
Change-Id: Ica4728bb090b2653d47308848ef8f771154879ca
Suprabh Shukla [Wed, 18 Oct 2017 18:51:00 +0000 (18:51 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours
am:
88f4c765a6 -s ours
Change-Id: Ia620503c958f9b1b2f44f2e99ba47d36bb558e0f
Suprabh Shukla [Wed, 18 Oct 2017 18:36:52 +0000 (18:36 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours
am:
54cbf03ecb -s ours
Change-Id: I500740d20bb4ee1b9cdb2de29387377e02be5872
Suprabh Shukla [Wed, 18 Oct 2017 18:19:39 +0000 (18:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours
am:
5bd2c48ac0 -s ours
Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804
Suprabh Shukla [Wed, 18 Oct 2017 18:04:15 +0000 (18:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f
am:
53a2e46036 -s ours
Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d
TreeHugger Robot [Wed, 18 Oct 2017 17:42:05 +0000 (17:42 +0000)]
Merge "Don't defer client hidden if activity is already paused" into oc-mr1-dev
Karthik Ravi Shankar [Wed, 18 Oct 2017 16:56:05 +0000 (16:56 +0000)]
Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev
TreeHugger Robot [Wed, 18 Oct 2017 13:20:43 +0000 (13:20 +0000)]
Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev
android-build-team Robot [Wed, 18 Oct 2017 07:23:05 +0000 (07:23 +0000)]
Snap for
4402249 from
3bdfe1a2517c4e2b6e9c7b7fe6b91eff77e4bd00 to oc-mr1-release
Change-Id: Ie68a5adf7e864f4b742298c14ac2487820decafc
android-build-team Robot [Wed, 18 Oct 2017 03:39:14 +0000 (03:39 +0000)]
Merge cherrypicks of [
3086272] into oc-mr1-release
Change-Id: I6f4c165b9f488de0e3258cad244fb34acf80190a
Adam Lesinski [Fri, 13 Oct 2017 19:40:37 +0000 (12:40 -0700)]
AAPT2: Flatten AndroidManifest.xml stringpool in UTF16
A few OEM devices have introduced a memory corruption bug
that is only triggered when an application's AndroidManifest.xml
uses UTF8 string pools. Workaround this by only encoding
AndroidManifest.xml with UTF16 strings.
Bug:
64434571
Test: manual
Change-Id: I2ee50d1b2b5942d971ef2a544c878de63f67c652
(cherry picked from commit
9c40250cdfcd289435a23a783de628a4cf2ca173)
TreeHugger Robot [Wed, 18 Oct 2017 00:51:00 +0000 (00:51 +0000)]
Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev
Adam Lesinski [Fri, 13 Oct 2017 19:40:37 +0000 (12:40 -0700)]
AAPT2: Flatten AndroidManifest.xml stringpool in UTF16
A few OEM devices have introduced a memory corruption bug
that is only triggered when an application's AndroidManifest.xml
uses UTF8 string pools. Workaround this by only encoding
AndroidManifest.xml with UTF16 strings.
Bug:
64434571
Test: manual
Change-Id: I2ee50d1b2b5942d971ef2a544c878de63f67c652
Winston Man [Tue, 17 Oct 2017 20:24:31 +0000 (21:24 +0100)]
Update build target to restrict it to arm and x86 only
This is to address build breakage for MIPS
https://android-build.googleplex.com/builds/submitted/
4400887/sdk_phone_mips-sdk_mac/latest/logs
Bug:
64504762
Test: build successful with target marlin-eng (arm), gce_x86_phone (x86) and sdk_phone_mips (mips)
Change-Id: I710c823ae235d0650b4d1a018180b552261aecc5
TreeHugger Robot [Tue, 17 Oct 2017 20:02:19 +0000 (20:02 +0000)]
Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
Evan Laird [Tue, 17 Oct 2017 20:00:29 +0000 (16:00 -0400)]
Fix incorrect colors for CustomTile in QS
Add support for Supplier<Icon> in QSTile.State, allowing a method for
CustomTile not to cache the drawable for its IconViews. This fixes the
problem that the ImageViews in QQS and QS were trying to use the same
drawable and putting it in a bad state.
Test: Add 3rd party tile to first position in QS and turn on/off; visual
Change-Id: I408d6391a718fcb3f847e72bd303551d2d004dbb
Fixes:
67356768
Winston Man [Tue, 17 Oct 2017 17:33:50 +0000 (17:33 +0000)]
Merge "Update pre-built apks in platform" into oc-mr1-dev
Winston Man [Mon, 16 Oct 2017 09:33:03 +0000 (10:33 +0100)]
Update pre-built apks in platform
Now include arm and x86 apks from built server
CtsShim (8.1.0-
4396705)
./packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
Built here:
https://android-build.googleplex.com/builds/branch-dashboard/ub-ctsshim-dev?build_id=
4396705
Final OC-MR1 drop for Oct 19th.
This build IS suitable for public release.
Bug:
64504762
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PrivilegedUpdateTests
Test: gts-tradefed run commandAndExit gts-dev --module GtsPackageManagerHostTestCases
Change-Id: I9a439f7287a8d3703cf014c7c03df2348a384a80
Mathieu Chartier [Tue, 17 Oct 2017 16:35:38 +0000 (16:35 +0000)]
Merge "DO NOT MERGE: Add extra compiled classes" into oc-mr1-dev
Wale Ogunwale [Tue, 5 Sep 2017 19:37:03 +0000 (12:37 -0700)]
Don't defer client hidden if activity is already paused
We defer client hidden to allow activities that support pip to
enter pip before onPause() returns. However, the condition only
checked for stopping and stopped states. There are situations
where the app is already paused and we are now moving it to the
invisible-stopped state. For does cases we need to make sure not
to defer client hidden, so that the right visibility is reported
to the app and the app can in-turn relayout out its windows to
invisible so that window manager can distroy and surfaces
associated with the windows when the exit animation is done.
Change-Id: Ib1c4cf6a989f597ba700ce460fca4b012bf5146b
Fixes:
63117546
Test: go/wm-smoke
android-build-team Robot [Tue, 17 Oct 2017 07:26:37 +0000 (07:26 +0000)]
Snap for
4399693 from
5182f884f21efb401d009b184326383c37f08138 to oc-mr1-release
Change-Id: I07d2c3e85a9a0d4c01af686d8c341e6f2b845c09
Karthik Ravi Shankar [Fri, 13 Oct 2017 22:42:32 +0000 (15:42 -0700)]
Add crash recovery logic to HardwarePropertiesManagerService
The HardwarePropertiesManagerService-JNI communicates with the thermal
HAL to expose temperature and other thermal data to Java services. When
Thermal HAL died, there was no recovery mechanism in place. This change
adds that recovery mechanism.
Bug:
67769672
Test:
1) Rebooted the device multiple times and checked that VrCore is able
to get the thermal information correctly.
2) Enter and exit VR mode multiple times killing thermalHal by design
and ensure that we're getting thermal temperatures correctly.
10-16 10:05:19.605 1099 1600 E HardwarePropertiesManagerService-JNI:
ThermalHAL just died
...
10-16 10:05:29.761 3459 3459 D ThermalWarningManager: THERMAL:
ThermalInfo: [current temp=33.0, VR throttling temp (soft exit)=52.0, VR
hard exit temp=54.0, VR warning temp=51.0, last throttling warning wall
time=n/a, last soft 'exit VR' flow wall time=n/a, last hard 'exit VR'
flow wall time=n/a]
Change-Id: I55d8eae31526e1bd1a232afea5bd02cb0afca142
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Zhi An Ng [Mon, 16 Oct 2017 23:03:22 +0000 (23:03 +0000)]
DO NOT MERGE Revert "Show dialog if top app is killed by lmk"
This reverts commit
84a2e2a06bb95e9c30f10a77d0fb90386b0f470d.
Comments in ag/
3029299 for more details. This revert is dependent on another revert ag/
3074066, which has been merged.
Reason for revert: No mechanism to check if an app is killed because of low memory killer
Bug:
65488249
Test: manual
Change-Id: I2940a5b9f22f3428432537acbf64a10f81b0b9d0
Siyamed Sinir [Tue, 17 Oct 2017 01:11:57 +0000 (01:11 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev
TreeHugger Robot [Mon, 16 Oct 2017 23:00:29 +0000 (23:00 +0000)]
Merge "Revert "Only show dialog if top app is killed"" into oc-mr1-dev
Mathieu Chartier [Mon, 16 Oct 2017 17:54:56 +0000 (10:54 -0700)]
DO NOT MERGE: Add extra compiled classes
Since compiled were not updated for MR1, this change incrementally
adds missing classes based on the typical use cases.
The reason that we only use boot image profiles in MR1 for Go is
because of risk concerns.
Generated with a threshold of 3.
Bug:
67730245
Test: make and flash
Change-Id: I9597bcec521514fdbf69521ef0e23a2d7ddcf656
TreeHugger Robot [Mon, 16 Oct 2017 21:33:03 +0000 (21:33 +0000)]
Merge "Move stub APK profile logic to performDexOptUpgrade" into oc-mr1-dev
Zhi An Ng [Mon, 16 Oct 2017 20:38:00 +0000 (20:38 +0000)]
Revert "Only show dialog if top app is killed"
This reverts commit
90024acefeed782ff89a6004802715529d5a189d.
Commens in ag/
3029299 for more details.
After this is reverted, ag/
2891284 will need to be reverted (for oc-mr1-dev),
and ag/
2961224 for master).
Reason for revert: No mechanism to check if an app is killed because of low memory killer
Change-Id: I4aeef4f3008280a34f0b898ed7a2da37be006a84
Bug:
65488249
TreeHugger Robot [Mon, 16 Oct 2017 19:37:31 +0000 (19:37 +0000)]
Merge "Auto-dim refinements" into oc-mr1-dev
TreeHugger Robot [Mon, 16 Oct 2017 18:56:49 +0000 (18:56 +0000)]
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
Mathieu Chartier [Mon, 16 Oct 2017 17:49:09 +0000 (17:49 +0000)]
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
Fyodor Kupolov [Thu, 12 Oct 2017 18:22:57 +0000 (11:22 -0700)]
Use calling user ID when calling isDeviceLocked
If isDeviceLocked is called with clearCallingIdentity,
original userId should be explicitly passed
Bug:
67621847
Test: Manual
Change-Id: I2bcb92572898811cc96bda1149ef806e6239e929
Jason Monk [Fri, 13 Oct 2017 14:34:40 +0000 (10:34 -0400)]
Auto-dim refinements
- Don't auto-dim while wallpaper is showing
- Up alpha to 60%
Change-Id: Ie5fc33279ca46f7de37befacbbd7b42b7d4e5d15
Fixes:
67735001
Test: manual
android-build-team Robot [Mon, 16 Oct 2017 07:22:12 +0000 (07:22 +0000)]
Snap for
4396806 from
9848c0af2c127652ecb6c4b7494beb15b6bc7b40 to oc-mr1-release
Change-Id: I4fa2860f47d2e6734be4c199455a81c0c16c2dec
Bill Yi [Mon, 16 Oct 2017 06:07:55 +0000 (06:07 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours
am:
b597ff837c -s ours
Change-Id: I4372cfb4a6dc243e9915d40f147a38119e4d1666
Bill Yi [Mon, 16 Oct 2017 05:59:25 +0000 (05:59 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours
am:
7e3f20e249 -s ours
Change-Id: I81957a7142c7ee4f702e4895bdfebdb190750367
Bill Yi [Mon, 16 Oct 2017 05:48:58 +0000 (05:48 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours
am:
43b03fbacf -s ours
Change-Id: If3ad876fdb726d199a8ccc26a1808f358377e44b
Bill Yi [Mon, 16 Oct 2017 05:41:21 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am:
b081f1e809 -s ours
Change-Id: I8589e76f2f5197beefddb2027261e290932d268f
Mathieu Chartier [Mon, 16 Oct 2017 04:13:28 +0000 (21:13 -0700)]
Add dalvik.vm.foreground-heap-growth-multiplier property
Corresponds to the -XX:ForegroundHeapGrowthMultiplier ART option.
Bug:
67416130
Test: make, flash, setprop
Change-Id: Ia9c70c62d8faa3b9aeb7b50dba237095abd53e80
Bill Yi [Sun, 15 Oct 2017 20:13:44 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id17cd2d22442f7bf1221be8f98164189757695a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
android-build-team Robot [Sun, 15 Oct 2017 07:25:13 +0000 (07:25 +0000)]
Snap for
4396223 from
7c18f52452774d1a9c92d9631abdd45053b76224 to oc-mr1-release
Change-Id: Ib231af7e9a2a480c425fff85e81e6356b86994e2
Pankaj Kanwar [Sun, 15 Oct 2017 04:03:46 +0000 (04:03 +0000)]
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
Mathieu Chartier [Fri, 13 Oct 2017 22:28:23 +0000 (22:28 +0000)]
Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev
TreeHugger Robot [Fri, 13 Oct 2017 20:22:56 +0000 (20:22 +0000)]
Merge "Update CtsShim with multiArch" into oc-mr1-dev
Winston Man [Tue, 5 Sep 2017 14:12:35 +0000 (15:12 +0100)]
Update CtsShim with multiArch
Add an empty .so to CTS for testing multiArch upgrade
Pre-built apk will be updated separately after this is merged
Testing build command will be updated later
Bug:
64504762
Test: all related cts and gts pass
Test: pre-built passed on all arch, including x86_64
Test: gts-tradefed run commandAndExit gts-dev --module GtsPackageManagerHostTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PrivilegedUpdateTests
Change-Id: I5abfe06de0bd730b5cdc317df344b7567d50aff6
Zhi An Ng [Fri, 13 Oct 2017 20:08:49 +0000 (20:08 +0000)]
Merge "Only show dialog if top app is killed" into oc-mr1-dev
android-build-team Robot [Fri, 13 Oct 2017 20:06:50 +0000 (20:06 +0000)]
Merge cherrypicks of [
3063860,
3064438,
3064439,
3063679,
3063680,
3063681,
3064498] into oc-mr1-release
Change-Id: I719a2008f570ddeda25d25f3bd034d07662eddac
Abodunrinwa Toki [Tue, 19 Sep 2017 22:18:40 +0000 (23:18 +0100)]
Flags to enable/disable smart selection in EditText
1. smart_selection_enabled_for_edit_text
Disables smart selection for editable text.
2. smart_selection_dark_launch
Dark launch TextClassifierImpl.suggestSelection(...)
In this mode we run the method, but never change the user's
selection to measure the quality of the results based on what
the user actually wanted.
Bug:
65959640
Test: Manually tested flags turn on/off feature with 'adb shell
settings put global' and GServices override.
Test: bit FrameworksCoreTests:android.provider.SettingsBackupTest
Merged-In: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
Change-Id: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
(cherry picked from commit
ba60ab604c880699166cc5fbfad95aa0f2501141)
Mathieu Chartier [Fri, 13 Oct 2017 18:29:27 +0000 (11:29 -0700)]
Add property reading logic for dalvik.vm.madvise-random
The property is passed to runtime init as
-XX:MadviseRandomAccess.
Bug:
67772594
Test: make and getprop
Change-Id: I7cbab5d028067810276bc58c312806ea3785f93f
TreeHugger Robot [Fri, 13 Oct 2017 18:25:51 +0000 (18:25 +0000)]
Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev
Andrii Kulian [Tue, 10 Oct 2017 07:41:41 +0000 (00:41 -0700)]
DO NOT MERGE: Don't let keyguard to influence orientation when dismissing
When keyguard is being dismissed it still was overriding orientation
for the display, which caused report of wrong configuration to
activity that was becoming visible.
Bug:
66979760
Bug:
36897968
Bug:
62796190
Bug:
62904487
Bug:
38494778
Test: Launch Unity 4 based game, lock and unlock screen, check UI
Test: com.android.server.wm.DisplayContentTests#testOrientationDefinedByKeyguard
Change-Id: I0a180b8e941a85ba4174a40cdec2ff0b8f3e00eb
Mathieu Chartier [Fri, 13 Oct 2017 16:25:23 +0000 (16:25 +0000)]
Merge "Add android.os.Parcel$ReadWriteHelper to compiled classes" into oc-mr1-dev
Abodunrinwa Toki [Tue, 19 Sep 2017 22:18:40 +0000 (23:18 +0100)]
Flags to enable/disable smart selection in EditText
1. smart_selection_enabled_for_edit_text
Disables smart selection for editable text.
2. smart_selection_dark_launch
Dark launch TextClassifierImpl.suggestSelection(...)
In this mode we run the method, but never change the user's
selection to measure the quality of the results based on what
the user actually wanted.
Bug:
65959640
Test: Manually tested flags turn on/off feature with 'adb shell
settings put global' and GServices override.
Test: bit FrameworksCoreTests:android.provider.SettingsBackupTest
Merged-In: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
Change-Id: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
android-build-team Robot [Fri, 13 Oct 2017 07:30:54 +0000 (07:30 +0000)]
Snap for
4393674 from
20fb01eb23934ea702efe94fc7db0242b5c976e2 to oc-mr1-release
Change-Id: I4e8a2d38f4c8697f0e2a3e274868141b8cde8433