git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Siyamed Sinir [Thu, 19 Oct 2017 04:09:18 +0000 (04:09 +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 am: b614e5560e
am: 1d1aac8621

Change-Id: I4142801a260251282d78a8e1c4b69a6d7b4b3b54

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:59:12 +0000 (03:59 +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 am: b614e5560e
am: 5cf9cbd3a3

Change-Id: I4d24939ad00fdf262e8a81c2a2468645093601cf

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:43:31 +0000 (03:43 +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
am: b614e5560e

Change-Id: If3c96f55d78b11e7372ca8783cf41f9a50984faa

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 03:43:28 +0000 (03:43 +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
am: b614e5560e

Change-Id: I34c80d0a98a7a4ea1c78f5ae8619e9566bb33476

commit | commitdiff | tree

Svet Ganov [Thu, 19 Oct 2017 03:26:00 +0000 (03:26 +0000)]

Merge "Preserve ranking attrs of resolve infos for installing a feature split" into oc-mr1-dev
am: 8f231b7aa6

Change-Id: Id85257c481a7d4e387ffc6ee628bfd2986ab5b3c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 02:41:36 +0000 (02:41 +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
am: da605f5a0e

Change-Id: Ifbb088171def4c9ecfc723f6aa3fd44fe3e4c091

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 02:33:18 +0000 (02:33 +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
am: 7f9454d63d

Change-Id: I4106b6b3a5ffce44afbe2fb0a515222a5fb97d69

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 02:16:32 +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: I630b1db9d19f34f6f42601a36a5883e824087287

commit | commitdiff | tree

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

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 02:12:01 +0000 (02:12 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 00:57:00 +0000 (00:57 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Thu, 19 Oct 2017 00:09:46 +0000 (00:09 +0000)]

Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev
am: c63c9f8ae1

Change-Id: Ib006982c87cc4378c697e213504adc05cf2c0658

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 18 Oct 2017 22:07:33 +0000 (22:07 +0000)]

Merge "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 am: 272c482c2a -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Suprabh Shukla [Wed, 18 Oct 2017 22:04:26 +0000 (22:04 +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
am: 272c482c2a -s ours

Change-Id: I605ca23c70c9c72f9cd06182fe9bddfe3f1375cc

commit | commitdiff | tree

Suprabh Shukla [Wed, 18 Oct 2017 21:53:30 +0000 (21:53 +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
am: beb43df980 -s ours

Change-Id: Ide13b073268906d38aaa70605836f8133468d357

commit | commitdiff | tree

Suprabh Shukla [Wed, 18 Oct 2017 21:28:46 +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: Icfdde90e4e98169ce4dbbc145b9422cd5a1787dc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Tom Cherry [Wed, 18 Oct 2017 19:44:54 +0000 (19:44 +0000)]

Merge "Allow ro. properties to have arbitrary lengths" am: 3851f132d1 am: 9fba6c2fe1
am: 918a29c88d

Change-Id: I29e0ca8d91d29431b498788b548fd48e85d6669b

commit | commitdiff | tree

Suprabh Shukla [Wed, 18 Oct 2017 19:43:57 +0000 (19:43 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 18 Oct 2017 19:17:53 +0000 (19:17 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 18 Oct 2017 19:05:08 +0000 (19:05 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Tom Cherry [Wed, 18 Oct 2017 18:48:55 +0000 (18:48 +0000)]

Merge "Allow ro. properties to have arbitrary lengths" am: 3851f132d1
am: 9fba6c2fe1

Change-Id: I17743afca87569e5ef6e17572aec0e8e8e535847

commit | commitdiff | tree

Tom Cherry [Wed, 18 Oct 2017 18:39:42 +0000 (18:39 +0000)]

Merge "Allow ro. properties to have arbitrary lengths"
am: 3851f132d1

Change-Id: Ie9c340401786d97e469e283418cffef6fbbbb186

commit | commitdiff | tree

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

commit | commitdiff | tree

Tom Cherry [Wed, 18 Oct 2017 18:21:10 +0000 (18:21 +0000)]

Merge "Allow ro. properties to have arbitrary lengths"

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Wed, 18 Oct 2017 18:16:41 +0000 (18:16 +0000)]

Merge "Don't defer client hidden if activity is already paused" into oc-mr1-dev
am: b3a8950183

Change-Id: I594079cd01aedb6f14cb534d43b8c0820a63c442

commit | commitdiff | tree

Karthik Ravi Shankar [Wed, 18 Oct 2017 18:09:08 +0000 (18:09 +0000)]

Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev
am: 2c25615224

Change-Id: I251edb32e216129d6cb1a1ad2b29f22505cb420a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Tom Cherry [Wed, 18 Oct 2017 16:25:17 +0000 (09:25 -0700)]

Allow ro. properties to have arbitrary lengths

Bug: 23102347
Bug: 34954705
Test: build
Change-Id: I99b074633c60e95cdd2284bf8a708b9187c1e310

commit | commitdiff | tree

Evan Laird [Wed, 18 Oct 2017 14:15:04 +0000 (14:15 +0000)]

Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev
am: 859f8c4a21

Change-Id: Id96f0a18c77628d63069ed434f5904936cb41359

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Willemsen [Wed, 18 Oct 2017 06:24:45 +0000 (06:24 +0000)]

Merge "Use soong_ui directly, instead of make" am: e994b4b584 am: 0531e5c647
am: 98fc198f1f

Change-Id: Id17adee4b02cc499261f88c3faed15d889f5b6c3

commit | commitdiff | tree

Dan Willemsen [Wed, 18 Oct 2017 06:17:09 +0000 (06:17 +0000)]

Merge "Use soong_ui directly, instead of make" am: e994b4b584
am: 0531e5c647

Change-Id: Ic3fc61824852181512f941dbc57c158540546616

commit | commitdiff | tree

Dan Willemsen [Wed, 18 Oct 2017 06:10:06 +0000 (06:10 +0000)]

Merge "Use soong_ui directly, instead of make"
am: e994b4b584

Change-Id: I406a02af2d5fd1accf5c53609af00f416669e18f

commit | commitdiff | tree

Dan Willemsen [Wed, 18 Oct 2017 06:00:51 +0000 (06:00 +0000)]

Merge "Use soong_ui directly, instead of make"

commit | commitdiff | tree

Adam Lesinski [Wed, 18 Oct 2017 00:57:26 +0000 (00:57 +0000)]

Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev
am: 3bdfe1a251

Change-Id: I3295e61dcf29a7cb242b4ee0017f2fd94a0cfd65

commit | commitdiff | tree

Dan Willemsen [Wed, 18 Oct 2017 00:46:41 +0000 (17:46 -0700)]

Use soong_ui directly, instead of make

This will use ckati instead of make for dumping variables, for
consistent makefile parsing. It may also sandbox executions, etc.

Also skip the legacy make wrapper to build, and use soong_ui instead.
The command line arguments are equivalent, but -j is no longer
necessary, we'll default to a sane value.

Test: bit -b framework
Change-Id: Idc2c9d1abe84b6b783b8702925de5493d47a4509

commit | commitdiff | tree

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

commit | commitdiff | tree

Winston Man [Tue, 17 Oct 2017 23:37:59 +0000 (23:37 +0000)]

Update build target to restrict it to arm and x86 only
am: 50365007b6

Change-Id: If461907f6f797e5fda72ef47147594a4ed7f41a9

commit | commitdiff | tree

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

commit | commitdiff | tree

Jordan Liu [Tue, 17 Oct 2017 21:36:11 +0000 (21:36 +0000)]

Merge "Add config to skip showing CF fail-to-disable dialog" am: d32138d78a am: a0df3496d3
am: 4025ccb0a1

Change-Id: Ida23475584fb0324ce12af05af422230b170b1a4

commit | commitdiff | tree

Jordan Liu [Tue, 17 Oct 2017 21:15:19 +0000 (21:15 +0000)]

Merge "Add config to skip showing CF fail-to-disable dialog" am: d32138d78a
am: a0df3496d3

Change-Id: Ic13004cc1c9afa5474df291211333e215ad96424

commit | commitdiff | tree

Jordan Liu [Tue, 17 Oct 2017 21:06:58 +0000 (21:06 +0000)]

Merge "Add config to skip showing CF fail-to-disable dialog"
am: d32138d78a

Change-Id: I0bb3388b4f2e0243049316c3548aacf6f034ffd2

commit | commitdiff | tree

Jordan Liu [Tue, 17 Oct 2017 20:58:01 +0000 (20:58 +0000)]

Merge "Add config to skip showing CF fail-to-disable dialog"

commit | commitdiff | tree

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

commit | commitdiff | tree

Zhi An Ng [Tue, 17 Oct 2017 20:16:02 +0000 (20:16 +0000)]

Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
am: d3dc9171d4

Change-Id: I6bf6797bdf92bfef0f4f8e23a394eaa7646460c0

commit | commitdiff | tree

Tom Cherry [Tue, 17 Oct 2017 20:04:51 +0000 (20:04 +0000)]

Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496ce9 am: b72c0626f5
am: 16e676be4b

Change-Id: Ie43c9ec866feba876016c8ceb4c1e5d6222f0a18

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bookatz [Tue, 17 Oct 2017 19:58:08 +0000 (19:58 +0000)]

Merge "Batterystats handles nested unoptimized ble scans" am: 4627c01ee4 -s ours am: 2fd6b1d7cd -s ours
am: 9fccdd14e5 -s ours

Change-Id: I593da51c7664d76c1ad64859823d434f4ce414fa

commit | commitdiff | tree

Tom Cherry [Tue, 17 Oct 2017 19:47:57 +0000 (19:47 +0000)]

Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496ce9
am: b72c0626f5

Change-Id: Ib0561d4ce3e027b2021bc6105f0be03ba6fffa99

commit | commitdiff | tree

Tom Cherry [Tue, 17 Oct 2017 19:37:45 +0000 (19:37 +0000)]

Merge "Frameworks: Remove warning for SystemProperties.get"
am: c589496ce9

Change-Id: Ibef1415adec0dac324b0531b7038640c3584fdf1

commit | commitdiff | tree

Bookatz [Tue, 17 Oct 2017 19:35:22 +0000 (19:35 +0000)]

Merge "Batterystats handles nested unoptimized ble scans" am: 4627c01ee4 -s ours
am: 2fd6b1d7cd -s ours

Change-Id: Iaad1877f6fbdee2beaa2328a3b3ee5025c468426

commit | commitdiff | tree

Tom Cherry [Tue, 17 Oct 2017 19:28:07 +0000 (19:28 +0000)]

Merge "Frameworks: Remove warning for SystemProperties.get"

commit | commitdiff | tree

Bookatz [Tue, 17 Oct 2017 19:24:40 +0000 (19:24 +0000)]

Merge "Batterystats handles nested unoptimized ble scans"
am: 4627c01ee4 -s ours

Change-Id: I044d02d6b00f63573870643ad83fce11740dd498

commit | commitdiff | tree

Treehugger Robot [Tue, 17 Oct 2017 19:03:52 +0000 (19:03 +0000)]

Merge "Batterystats handles nested unoptimized ble scans"

commit | commitdiff | tree

Winston Man [Tue, 17 Oct 2017 17:49:05 +0000 (17:49 +0000)]

Merge "Update pre-built apks in platform" into oc-mr1-dev
am: 69780830e5

Change-Id: I73a727dc39e0d2be1d47afeef1305362b13ffbc4

commit | commitdiff | tree

Winston Man [Tue, 17 Oct 2017 17:33:50 +0000 (17:33 +0000)]

Merge "Update pre-built apks in platform" into oc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Tue, 17 Oct 2017 16:53:35 +0000 (16:53 +0000)]

Merge "DO NOT MERGE: Add extra compiled classes" into oc-mr1-dev
am: 1d1ff0b030

Change-Id: I588c1a5d59a5e3455d6c19dfcb18b9ff59283e15

commit | commitdiff | tree

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

commit | commitdiff | tree

Tom Cherry [Tue, 17 Oct 2017 16:20:01 +0000 (09:20 -0700)]

Frameworks: Remove warning for SystemProperties.get

We now disallow non-UTF8 property values directly in property_service,
so there is no need for this warning.

This partially reverts 33aea8d40e6cc99f7968a6c6605a81a4587b85e7.

Bug: 63177684
Test: make
Change-Id: I61f49f635c6095013f55b906e00925a8cbd1ea8c

commit | commitdiff | tree

DongYuchen [Thu, 16 Feb 2017 10:22:36 +0000 (18:22 +0800)]

Add config to skip showing CF fail-to-disable dialog

Add config to skip showing CF fail-to-disable dialog. Because it is not
always correct to show fail-to-disable dialog. It depends on the way
of NW CF handling. The default value is set to false.

Test: manual - checked the call forwarding fail dialog was not shown
Bug: 35790386
Change-Id: I8b0e3d15736d95df8fcac205cb9a3ef2f8579988

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

Sooraj Sasindran [Tue, 17 Oct 2017 06:29:22 +0000 (06:29 +0000)]

Merge "Enhance network scan request" am: b9f49e671a am: d5987f9722
am: c1333187cd

Change-Id: I8a9d698e2b8be06ffa8433dbdce81e673130cde8

commit | commitdiff | tree

Sooraj Sasindran [Tue, 17 Oct 2017 06:19:46 +0000 (06:19 +0000)]

Merge "Enhance network scan request" am: b9f49e671a
am: d5987f9722

Change-Id: Ifb781febbb687036b15746f809499788b802566b

commit | commitdiff | tree

Sooraj Sasindran [Tue, 17 Oct 2017 06:11:06 +0000 (06:11 +0000)]

Merge "Enhance network scan request"
am: b9f49e671a

Change-Id: If24d4740c346761391213f94647c43cbd742444a

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help