OSDN Git Service

android-x86/frameworks-base.git
6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Fri, 20 Oct 2017 01:33:20 +0000 (01:33 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 am: 00183554a9  -s ours am: 61d6dd8185
am: 438ed4369d

Change-Id: I467f1f279116602880a6533cadf0dc7721bdfe88

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Fri, 20 Oct 2017 01:17:09 +0000 (01:17 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd am: c257b61ec2 am: 21bdeacae7 am: 6ecad744a9
am: 289db3b4f3

Change-Id: I71991fe9cd3b442dff4ce84657cd84936511a8b2

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Fri, 20 Oct 2017 01:11:01 +0000 (01:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 am: 00183554a9  -s ours
am: 61d6dd8185

Change-Id: I9b862fb8aa4858bf57aa390c7d54a65bb19d12fd

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Fri, 20 Oct 2017 00:58:26 +0000 (00:58 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd am: c257b61ec2 am: 21bdeacae7
am: 6ecad744a9

Change-Id: I11a06f501b8278c356e7c2072c00b7d86470a64a

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Fri, 20 Oct 2017 00:40:14 +0000 (00:40 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0
am: 00183554a9  -s ours

Change-Id: I6ff359477121027efd13e82ce530a4fce32d3564

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Fri, 20 Oct 2017 00:36:59 +0000 (00:36 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac  -s ours am: b6ecd1f88a
am: f2e1ef2297

Change-Id: I99d77a01bbd5992effb98cc2cec15a27ab78d223

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Fri, 20 Oct 2017 00:31:27 +0000 (00:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b
am: 1b40397eb0

Change-Id: If7bafe99a0d9563f9c09f5632b6e023ee328ffdb

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Fri, 20 Oct 2017 00:27:10 +0000 (00:27 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd am: c257b61ec2
am: 21bdeacae7

Change-Id: I3c633755286caa3ae6538581bc05a8374a8ef691

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac  -s ours
am: b6ecd1f88a

Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Fri, 20 Oct 2017 00:12:31 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e am: 9f073ee9fd
am: c257b61ec2

Change-Id: I5369e96fe95e0db7206c61bb1af5b140a788890a

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Fri, 20 Oct 2017 00:03:14 +0000 (00:03 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours am: 7f00f14d81 am: 3c30346de2
am: b049f43f9b

Change-Id: Id6f534c7fb34dcd7a16478de7a0de80688322d47

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1
am: 260ef208ac  -s ours

Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Thu, 19 Oct 2017 23:47:49 +0000 (23:47 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9 am: bf5b9d7e8e
am: 9f073ee9fd

Change-Id: I6d9c5637245a5e242761d8368aea06a4cbfbd013

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Thu, 19 Oct 2017 23:46:05 +0000 (23:46 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours am: 7f00f14d81
am: 3c30346de2

Change-Id: Ib4bfd2cde222e01e876d9b4ffc3a2135037c860d

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 23:37:21 +0000 (23:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16
am: 4dd01948c1

Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Thu, 19 Oct 2017 23:31:46 +0000 (23:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours
am: 7f00f14d81

Change-Id: I79f42935ccfa12f7a5e5d22957a06f50825e2dcf

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Thu, 19 Oct 2017 23:29:06 +0000 (23:29 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994 am: 4afdfec2d9
am: bf5b9d7e8e

Change-Id: Iffbe5920dbe7406a8e895901dd8cc097f22c397e

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Thu, 19 Oct 2017 23:17:45 +0000 (23:17 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b
am: 1455bd6492  -s ours

Change-Id: I2e15595d4e8f797d5b5606a5298ac50b83cf581b

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Thu, 19 Oct 2017 23:15:25 +0000 (23:15 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f am: 74b3298994
am: 4afdfec2d9

Change-Id: Ica998b67cb1a0d94767863f17c292eca7083b780

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 23:11:55 +0000 (23:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef am: 5fda53b294
am: 791d8a5b16

Change-Id: I0678613fd0293afeafa38c4ac9fb0a55fb4b3969

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Thu, 19 Oct 2017 23:06:16 +0000 (23:06 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7
am: 901c587c6b

Change-Id: I3e721dc6183024b73b70d1f30363983a7afaf6d1

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Thu, 19 Oct 2017 23:03:18 +0000 (23:03 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d am: 4c7113461f
am: 74b3298994

Change-Id: If2e11ec2b732d2295484d489eabf7ae183c30038

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:56:23 +0000 (22:56 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef
am: 5fda53b294

Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Thu, 19 Oct 2017 22:51:30 +0000 (22:51 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3 am: 63bb54738d
am: 4c7113461f

Change-Id: If52cdfdbd9e3eee06a109a5b4f1bff82d9506b73

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am...
Jeff Sharkey [Thu, 19 Oct 2017 22:44:02 +0000 (22:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549
am: 563ea682e7

Change-Id: I393058caae6a8cc446597509b20241723f22a238

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours
am: bcdb9079ef

Change-Id: Id065bc6f31814aed56fce0ddd9a1b6378d9364ee

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Thu, 19 Oct 2017 22:34:08 +0000 (22:34 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours am: 1c7cdde2d3
am: 63bb54738d

Change-Id: Ie5bd667854712446924704bc839e80bb66d06a63

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours
Jeff Sharkey [Thu, 19 Oct 2017 22:25:25 +0000 (22:25 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours
am: b52056d549

Change-Id: I520162dc90c1855d0a6324e62507f78d6ce5b329

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:20:11 +0000 (22:20 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb
am: 7b1157a92e  -s ours

Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c...
Siyamed Sinir [Thu, 19 Oct 2017 22:16:30 +0000 (22:16 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3  -s ours
am: 1c7cdde2d3

Change-Id: Iee9737ebbb5e9f3d476ddb54d9ae9898b2d01d14

6 years agoDO NOT MERGE. KEY_INTENT shouldn't grant permissions.
Jeff Sharkey [Thu, 19 Oct 2017 22:10:20 +0000 (22:10 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: 1f2a5d3622  -s ours

Change-Id: I2bf88a0e4808e7d3db67e7944696121c284ed7ae

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 22:06:02 +0000 (22:06 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c
am: 06bd19c1fb

Change-Id: I6f6cb9cf71ba1584b162d6b18c28c2825323e7be

6 years agoFix ClipboardService device lock check for cross profile am: 0595b5a94b
Siyamed Sinir [Thu, 19 Oct 2017 22:04:10 +0000 (22:04 +0000)]
Fix ClipboardService device lock check for cross profile am: 0595b5a94b
am: 9e5a4ed6c3  -s ours

Change-Id: Ie6822b787e5777688faadcf125637b9c66c202de

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 21:50:59 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b
am: d7ece4da2c

Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
Beverly Tai [Thu, 19 Oct 2017 21:35:03 +0000 (21:35 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours
am: dfbaa1fd8b

Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753

6 years agoMerge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
Beverly Tai [Thu, 19 Oct 2017 21:18:55 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am: f2b592726d  -s ours

Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 271702fc28
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

6 years agoReuse the BluetoothBatteryDrawable in QS detail
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 19 Oct 2017 15:52:22 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "Preserve ranking attrs of resolve infos for installing a feature split" into...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoMerge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
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

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoPreserve ranking attrs of resolve infos for installing a feature split
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448...
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

6 years agoRevert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448
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

6 years agoMerge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..."...
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

6 years agoDO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with...
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

6 years agoAAPT2: Ensure strings are sorted by configuration
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e460...
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