Commit Graph

342574 Commits

Author SHA1 Message Date
Android Build Merger (Role)
462128f831 Merge "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 am: bd0619b1c5" into oc-mr1-dev-plus-aosp 2017-10-20 02:08:38 +00:00
Siyamed Sinir
f0cbef9f96 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
am: bd0619b1c5

Change-Id: I139a02d16496fc519817787a3e9af86f60eb4d6b
2017-10-20 02:07:09 +00:00
Jeff Sharkey
6eeabc69e4 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
am: 74552f1b98

Change-Id: Ia74aa97493e816c84b65303210e29caa63a28f09
2017-10-20 01:59:35 +00:00
Siyamed Sinir
dd77a3da32 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
am: cd30a463c6

Change-Id: Icdcc49677e3e1fac23a284dbd857a74431dc6b21
2017-10-20 01:42:40 +00:00
Jeff Sharkey
74552f1b98 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
2017-10-20 01:33:20 +00:00
Siyamed Sinir
bd0619b1c5 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: Iecbafde6b2ee313cc7d3b28704b257219266341f
2017-10-20 01:21:24 +00:00
Android Build Merger (Role)
11a7e42c8e Merge "Merge "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" into oc-dr1-dev-plus-aosp am: a6b9a27c35" into oc-mr1-dev-plus-aosp 2017-10-20 01:17:57 +00:00
Siyamed Sinir
cd30a463c6 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
2017-10-20 01:17:09 +00:00
Beverly Tai
a8a8d47516 Merge "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" into oc-dr1-dev-plus-aosp
am: a6b9a27c35

Change-Id: I22b9c537fb0f5e1b1414be25f20b6710d00e2f90
2017-10-20 01:16:27 +00:00
Jeff Sharkey
438ed4369d 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
2017-10-20 01:11:01 +00:00
Android Build Merger (Role)
d11e149269 Merge "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 am: edc549d78e" into oc-mr1-dev-plus-aosp 2017-10-20 00:59:12 +00:00
Siyamed Sinir
289db3b4f3 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
2017-10-20 00:58:26 +00:00
Beverly Tai
0b5a5edcfb 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
am: edc549d78e

Change-Id: I4fcd58e1471efc519e2c3bcba2d1bcdca4b747e9
2017-10-20 00:56:21 +00:00
Nan Zhang
0af34ddfc8 Merge "Shard framework during Java compilation for target side." am: 6a90c3f793 am: b06e03c134
am: 6b4f75ec4a

Change-Id: Iba206e39782bf0ac8057470d856251a599a230c9
2017-10-20 00:50:31 +00:00
Jeff Sharkey
61d6dd8185 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
2017-10-20 00:40:14 +00:00
Android Build Merger (Role)
a6b9a27c35 Merge "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" into oc-dr1-dev-plus-aosp 2017-10-20 00:39:30 +00:00
Beverly Tai
edc549d78e 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
2017-10-20 00:36:59 +00:00
Beverly Tai
ef308dc0bc 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: I1d35f22d61dcb6dd29b0815999b4300656d84a19
2017-10-20 00:36:59 +00:00
Suprabh Shukla
d9430fb4fb 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: d6e80237d9

Change-Id: Id57a09b062896003af97edb7b25b8fd077004586
2017-10-20 00:33:21 +00:00
Jeff Sharkey
00183554a9 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
2017-10-20 00:31:27 +00:00
Nan Zhang
6b4f75ec4a Merge "Shard framework during Java compilation for target side." am: 6a90c3f793
am: b06e03c134

Change-Id: I9ae5c3ae45cac0a53b81043f33af2fd2910e86f8
2017-10-20 00:27:11 +00:00
Siyamed Sinir
6ecad744a9 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
2017-10-20 00:27:10 +00:00
Suprabh Shukla
fd58475dcc 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
2017-10-20 00:21:45 +00:00
Nan Zhang
b06e03c134 Merge "Shard framework during Java compilation for target side."
am: 6a90c3f793

Change-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04
2017-10-20 00:17:23 +00:00
Beverly Tai
f2e1ef2297 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
2017-10-20 00:17:11 +00:00
Siyamed Sinir
21bdeacae7 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
2017-10-20 00:12:31 +00:00
Jeff Sharkey
1b40397eb0 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
2017-10-20 00:03:14 +00:00
Suprabh Shukla
d6e80237d9 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: Ib2de51e856b8fe7da42c37490cb84bafee9ed2f7
2017-10-20 00:02:54 +00:00
Suprabh Shukla
fa4d0a1d80 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
2017-10-20 00:01:26 +00:00
Beverly Tai
b6ecd1f88a 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
2017-10-19 23:52:10 +00:00
Siyamed Sinir
c257b61ec2 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
2017-10-19 23:47:49 +00:00
Treehugger Robot
6a90c3f793 Merge "Shard framework during Java compilation for target side." 2017-10-19 23:46:18 +00:00
Jeff Sharkey
b049f43f9b 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
2017-10-19 23:46:05 +00:00
Suprabh Shukla
7078aaa62a 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
2017-10-19 23:43:16 +00:00
Beverly Tai
260ef208ac 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
2017-10-19 23:37:21 +00:00
Jeff Sharkey
3c30346de2 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
2017-10-19 23:31:46 +00:00
Siyamed Sinir
9f073ee9fd 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
2017-10-19 23:29:06 +00:00
Suprabh Shukla
14164f1bdf 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
2017-10-19 23:22:43 +00:00
Jeff Sharkey
7f00f14d81 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
2017-10-19 23:17:45 +00:00
Siyamed Sinir
bf5b9d7e8e 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
2017-10-19 23:15:25 +00:00
Beverly Tai
4dd01948c1 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
2017-10-19 23:11:55 +00:00
Suprabh Shukla
02d89a3c0c 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
2017-10-19 23:09:02 +00:00
Jeff Sharkey
1455bd6492 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7
am: 901c587c6b

Change-Id: I3e721dc6183024b73b70d1f30363983a7afaf6d1
2017-10-19 23:06:16 +00:00
Siyamed Sinir
4afdfec2d9 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
2017-10-19 23:03:18 +00:00
Beverly Tai
791d8a5b16 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
2017-10-19 22:56:23 +00:00
Suprabh Shukla
29257874f9 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
2017-10-19 22:54:42 +00:00
Siyamed Sinir
74b3298994 Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d
am: 4c7113461f

Change-Id: If52cdfdbd9e3eee06a109a5b4f1bff82d9506b73
2017-10-19 22:51:30 +00:00
Jeff Sharkey
901c587c6b DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549
am: 563ea682e7

Change-Id: I393058caae6a8cc446597509b20241723f22a238
2017-10-19 22:44:02 +00:00
Suprabh Shukla
a4454ba4a9 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
2017-10-19 22:40:05 +00:00
Beverly Tai
5fda53b294 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
2017-10-19 22:39:14 +00:00