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

Jeff Sharkey [Fri, 20 Oct 2017 01:51:28 +0000 (01:51 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 am: af70ac2914 -s ours am: 571c8a4507
am: 45829c0c41

Change-Id: If6545cd5d279f973360f34bc792411407a2b037d

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 01:39:17 +0000 (01:39 +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: Ia7a5b82bc9d5a674fc268c9b1ffe29c985eb4aff

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 01:26:22 +0000 (01:26 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 am: af70ac2914 -s ours
am: 571c8a4507

Change-Id: Ie4e871d2017d505461027c376946e2034105062a

commit | commitdiff | tree

Siyamed Sinir [Fri, 20 Oct 2017 01:21:24 +0000 (01:21 +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: Iecbafde6b2ee313cc7d3b28704b257219266341f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 00:57:09 +0000 (00:57 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106
am: af70ac2914 -s ours

Change-Id: Ie750d6963f29c0f60a6e2e4ef2a0e8fa4201e06a

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 00:46:57 +0000 (00:46 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb
am: 76d9732106

Change-Id: Idfdb3ab78f68d6b41d99bca533045118cc34574e

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 00:39:30 +0000 (00:39 +0000)]

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

commit | commitdiff | tree

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: I1d35f22d61dcb6dd29b0815999b4300656d84a19

commit | commitdiff | tree

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

commit | commitdiff | tree

Nan Zhang [Fri, 20 Oct 2017 00:27:11 +0000 (00:27 +0000)]

Merge "Shard framework during Java compilation for target side." am: 6a90c3f793
am: b06e03c134

Change-Id: I9ae5c3ae45cac0a53b81043f33af2fd2910e86f8

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 00:22:39 +0000 (00:22 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2
am: 34e4628cfb

Change-Id: I0b37777cbd94bb4c3bc60315aff3a2ebc324273c

commit | commitdiff | tree

Nan Zhang [Fri, 20 Oct 2017 00:17:23 +0000 (00:17 +0000)]

Merge "Shard framework during Java compilation for target side."
am: 6a90c3f793

Change-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 00:06:43 +0000 (00:06 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8
am: 832890f6e2

Change-Id: Ie3d4564dc4d4790f6cae5cbef45c47aa2eb5000a

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Fri, 20 Oct 2017 00:02:54 +0000 (00:02 +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: Ib2de51e856b8fe7da42c37490cb84bafee9ed2f7

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 23:50:34 +0000 (23:50 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours
am: 73a4e88df8

Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 19 Oct 2017 23:46:18 +0000 (23:46 +0000)]

Merge "Shard framework during Java compilation for target side."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 23:26:57 +0000 (23:26 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693
am: 3bb6994a0b -s ours

Change-Id: I5b8a2b5df614aa4abe813e48ebf030d15dbf0202

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 23:17:05 +0000 (23:17 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9
am: 2f8dbe9693

Change-Id: I5cd93d250ea8c6cd45616aaafabd0eda68da4538

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:58:37 +0000 (22:58 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb
am: 9c441159f9

Change-Id: I3533fdd4683cb85f66e107c3b4038f1a7ec97dfc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:32:13 +0000 (22:32 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours
am: 08bd3a75fb

Change-Id: I18e61b7280df672c91bb076f3ed894f895e075a0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:20:11 +0000 (22:20 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:14:01 +0000 (22:14 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours
am: edb6b17ebc -s ours

Change-Id: Ie31aff669dfbabd860c123d4448362af4903973d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jerry Zhang [Thu, 19 Oct 2017 18:11:49 +0000 (18:11 +0000)]

Merge "Add storageId to moveObjects"
am: 1f4f6d2a18

Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e

commit | commitdiff | tree

Jerry Zhang [Thu, 19 Oct 2017 17:55:34 +0000 (17:55 +0000)]

Merge "Add storageId to moveObjects"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Benedict Wong [Thu, 19 Oct 2017 17:06:30 +0000 (17:06 +0000)]

Merge "Add support for AES-GCM-ESP as an IPSec algorithm"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 16:08:07 +0000 (16:08 +0000)]

Merge "Move most android.util.Mutable* classes to framework."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Tobias Thierer [Thu, 19 Oct 2017 14:15:52 +0000 (14:15 +0000)]

Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 19 Oct 2017 05:53:23 +0000 (05:53 +0000)]

Merge "Settings: Fix leak of BroadcastReceiver intents"

commit | commitdiff | tree

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)]

commit | commitdiff | tree

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

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

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