OSDN Git Service
Suprabh Shukla [Fri, 20 Oct 2017 00:21:45 +0000 (00:21 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf am:
7078aaa62a
am:
fa4d0a1d80
Change-Id: Ifaa66862877cbdde99a93f2ba7c59f8f1da8a5f4
Suprabh Shukla [Fri, 20 Oct 2017 00:01:26 +0000 (00:01 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf
am:
7078aaa62a
Change-Id: I00826913bfa33d529b3056c7d4a2b4a9215172d8
Suprabh Shukla [Thu, 19 Oct 2017 23:43:16 +0000 (23:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c
am:
14164f1bdf
Change-Id: I6bea094bde1b97604d7769646d9b04f7e6b21ca2
Suprabh Shukla [Thu, 19 Oct 2017 23:22:43 +0000 (23:22 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9
am:
02d89a3c0c
Change-Id: If82c97668497ce72ad29b055b15646291df66157
Suprabh Shukla [Thu, 19 Oct 2017 23:09:02 +0000 (23:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9
am:
29257874f9
Change-Id: I3852ef99532b956fd3280c49d6722c2aed1d79a6
Suprabh Shukla [Thu, 19 Oct 2017 22:54:42 +0000 (22:54 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55
am:
a4454ba4a9
Change-Id: Ie24e5fc3ab442ca5c51ca79687d417ae563d631c
Suprabh Shukla [Thu, 19 Oct 2017 22:40:05 +0000 (22:40 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b
am:
d1150b7e55
Change-Id: Iac842a9f018f24c905d4e165362f5bf87470d296
Suprabh Shukla [Thu, 19 Oct 2017 22:25:04 +0000 (22:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1
am:
55ffaea04b
Change-Id: I10a7a16d5463e4cbf7880b1979541ea82a56ddd3
Suprabh Shukla [Thu, 19 Oct 2017 22:06:31 +0000 (22:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06
am:
cf8fe172a1
Change-Id: I8600883ef4cad6f8b11fc005fc9cfd62d84aeb08
Suprabh Shukla [Thu, 19 Oct 2017 21:55:31 +0000 (21:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef
am:
8fb52c8d06
Change-Id: I2d8cdac51baf7b8df6b903f0416e525e9ec44784
Adam Lesinski [Thu, 19 Oct 2017 21:43:31 +0000 (21:43 +0000)]
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
am:
8da74b1bfd
Change-Id: Ifd3555db424136fe8a8057504df414f41fb020a1
Suprabh Shukla [Thu, 19 Oct 2017 21:41:08 +0000 (21:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5
am:
6f0e6952ef
Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240
jackqdyulei [Thu, 19 Oct 2017 21:31:54 +0000 (21:31 +0000)]
Reuse the BluetoothBatteryDrawable in QS detail
am:
4b7f43bcae
Change-Id: Ie5fd81010fae4660bb0fdd5d6d061fa535d86150
TreeHugger Robot [Thu, 19 Oct 2017 21:31:10 +0000 (21:31 +0000)]
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
Suprabh Shukla [Thu, 19 Oct 2017 21:25:06 +0000 (21:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours
am:
159648d6e5
Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23
Suprabh Shukla [Thu, 19 Oct 2017 20:57:26 +0000 (20:57 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28
am:
8b438236ce -s ours
Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec
jackqdyulei [Thu, 19 Oct 2017 18:05:09 +0000 (11:05 -0700)]
Reuse the BluetoothBatteryDrawable in QS detail
BluetoothBatteryDrawable creates the drawable lazily using
the latest(and most correct) context. So it could get the
correct color from the theme.
Also add iconScale field in BluetoothBatteryDrawable so the size
of the battery icon could be scaled.
Bug:
67377756
Test: Manual - connected to bluetooth headphone and open the qs
page and detail page. Retest it after changing it to dark theme.
Change-Id: Ic6c871985a89a503221755eed4bc2605ab53f630
Jerry Zhang [Thu, 19 Oct 2017 18:36:22 +0000 (18:36 +0000)]
Merge "Add storageId to moveObjects" am:
1f4f6d2a18 am:
18abf57e99
am:
59ff05a59f
Change-Id: I024be0c75e20e58152dbe0c81e5548d70f06a925
Jerry Zhang [Thu, 19 Oct 2017 18:22:46 +0000 (18:22 +0000)]
Merge "Add storageId to moveObjects" am:
1f4f6d2a18
am:
18abf57e99
Change-Id: Ieb79d5a10307c47cd772ae5ef621717d5c90cdc2
Jerry Zhang [Thu, 19 Oct 2017 18:11:49 +0000 (18:11 +0000)]
Merge "Add storageId to moveObjects"
am:
1f4f6d2a18
Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e
Jerry Zhang [Thu, 19 Oct 2017 17:55:34 +0000 (17:55 +0000)]
Merge "Add storageId to moveObjects"
Benedict Wong [Thu, 19 Oct 2017 17:37:22 +0000 (17:37 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am:
b6df7f0d35 am:
d3a5792024
am:
f92bfc3b77
Change-Id: I49932a5fc048b4a60512fac45a3537f050397168
Benedict Wong [Thu, 19 Oct 2017 17:26:19 +0000 (17:26 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am:
b6df7f0d35
am:
d3a5792024
Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18
Benedict Wong [Thu, 19 Oct 2017 17:14:53 +0000 (17:14 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am:
b6df7f0d35
Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
Benedict Wong [Thu, 19 Oct 2017 17:06:30 +0000 (17:06 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
Tobias Thierer [Thu, 19 Oct 2017 16:42:50 +0000 (16:42 +0000)]
Merge "Move most android.util.Mutable* classes to framework." am:
cd06caf10e am:
4719440f3f
am:
23c2a6578b
Change-Id: I990ecf36ee6d2cd1d55c7cb1e652a8998ff84f35
Tobias Thierer [Thu, 19 Oct 2017 16:31:25 +0000 (16:31 +0000)]
Merge "Move most android.util.Mutable* classes to framework." am:
cd06caf10e
am:
4719440f3f
Change-Id: I699ae1fdec65f8c0ed584c13424e922f226d3ce0
Tobias Thierer [Thu, 19 Oct 2017 16:18:44 +0000 (16:18 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
am:
cd06caf10e
Change-Id: I25fd01bd4bc8c582e6cb79a03de47847b46bcb83
Tobias Thierer [Thu, 19 Oct 2017 16:08:07 +0000 (16:08 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
Bill Yi [Thu, 19 Oct 2017 16:02:24 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
db768d45e0 -s ours
Change-Id: Ie3665e5f71cf66f0eb36741a42244043b70b78b4
TreeHugger Robot [Thu, 19 Oct 2017 15:52:22 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Tobias Thierer [Thu, 19 Oct 2017 15:12:57 +0000 (16:12 +0100)]
resolve merge conflicts of
5c9e47d28b24 to oc-mr1-dev-plus-aosp
Test: This merge conflict was automatically resolved by meld.
The automatic resolution of the same merge conflict by meld
from cherrypicking this CL into internal-master has passed
Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b
Tobias Thierer [Thu, 19 Oct 2017 14:34:36 +0000 (14:34 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" am:
5f04db96b3
am:
07efe116b1
Change-Id: I1c9f25ea1ac00037cc90dfe4c8c2552f90a33ecd
Tobias Thierer [Thu, 19 Oct 2017 14:25:12 +0000 (14:25 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am:
5f04db96b3
Change-Id: If85216d03022708787a7218e494434453d5548e3
Tobias Thierer [Thu, 19 Oct 2017 14:15:52 +0000 (14:15 +0000)]
Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
Bill Yi [Thu, 19 Oct 2017 08:21:34 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I359b63c9efc317b1a6053d73321a3769871efbf3
Manu Viswanadhan [Thu, 19 Oct 2017 06:21:39 +0000 (06:21 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents" am:
3499af28c4 am:
1b4a0abdbb
am:
517b35fa1c
Change-Id: I11f0b50f93e2a722ecf3c8bd398462c967d9bfb2
Manu Viswanadhan [Thu, 19 Oct 2017 06:12:20 +0000 (06:12 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents" am:
3499af28c4
am:
1b4a0abdbb
Change-Id: I4779532a0be4e8a821e521d1b962b4c57ecf86b8
Manu Viswanadhan [Thu, 19 Oct 2017 06:02:23 +0000 (06:02 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents"
am:
3499af28c4
Change-Id: I2b0f3920f39981956d25017999a25799d995252b
Treehugger Robot [Thu, 19 Oct 2017 05:53:23 +0000 (05:53 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents"
Beverly Tai [Thu, 19 Oct 2017 04:26:57 +0000 (04:26 +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 am:
a9d3b4d806
am:
ea0b574ea5
Change-Id: I998c65ff305494f8527f97c4b4d28fb4f791585d
Android Build Merger (Role) [Thu, 19 Oct 2017 04:16:51 +0000 (04:16 +0000)]
Merge "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 am:
a9d3b4d806 am:
1fa3f2a9d0" into oc-mr1-dev-plus-aosp
Beverly Tai [Thu, 19 Oct 2017 04:15:24 +0000 (04:15 +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 am:
a9d3b4d806
am:
1fa3f2a9d0
Change-Id: I2847d3a98f87781d601406283a6909f55fe0db82
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
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
Beverly Tai [Thu, 19 Oct 2017 03:58:38 +0000 (03:58 +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
am:
a9d3b4d806
Change-Id: I325ff1074f1481ffdb661a8bee155b64e7586f1b
Beverly Tai [Thu, 19 Oct 2017 03:58:35 +0000 (03:58 +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
am:
a9d3b4d806
Change-Id: Id867bdf6b1756dd2a1cf8a9229d61125aeccf463
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
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
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
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
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
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
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
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
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: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
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
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
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
Manu Viswanadhan [Tue, 25 Oct 2016 15:08:23 +0000 (20:38 +0530)]
Settings: Fix leak of BroadcastReceiver intents
Use Case: Repeated BT ON/OFF
Failure: Broadcast receiver leak is observed with ON/OFF stress
test which leads to broadcast receiver delays.
Steps:
BT ON/OFF.
Root Cause: During every ON/OFF there are broadcast receiver leaks
caused by repeated registering of profile intent receivers.
Fix: Separate broadcast receiver created for profile intents, such
that broadcast receiver for adapter state intents is always
active. Unregister and re-register the profile receiver when BT
is turned OFF.
Test: BT ON/OFF
Bug:
35415158
Change-Id: Id1db747c61bb2dd33515ac45cdc2059844d3e4f5
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
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
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
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
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
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