OSDN Git Service
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 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
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
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
Suprabh Shukla [Wed, 18 Oct 2017 19:05:08 +0000 (19: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
Change-Id: Ica4728bb090b2653d47308848ef8f771154879ca
Suprabh Shukla [Wed, 18 Oct 2017 18:51:00 +0000 (18:51 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours am:
54cbf03ecb -s ours
am:
88f4c765a6 -s ours
Change-Id: Ia620503c958f9b1b2f44f2e99ba47d36bb558e0f
Suprabh Shukla [Wed, 18 Oct 2017 18:36:52 +0000 (18:36 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours am:
5bd2c48ac0 -s ours
am:
54cbf03ecb -s ours
Change-Id: I500740d20bb4ee1b9cdb2de29387377e02be5872
Suprabh Shukla [Wed, 18 Oct 2017 18:19:39 +0000 (18:19 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f am:
53a2e46036 -s ours
am:
5bd2c48ac0 -s ours
Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804
Suprabh Shukla [Wed, 18 Oct 2017 18:04:15 +0000 (18:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
89c0dbca0f
am:
53a2e46036 -s ours
Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d
Jeff Sharkey [Wed, 11 Oct 2017 22:55:00 +0000 (22:55 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
ca7ffa06bc -s ours
Change-Id: I306c63c1922f29f1df3cb225bd2d3153cadecaa3
Jeff Sharkey [Wed, 11 Oct 2017 21:20:52 +0000 (21:20 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63
am:
8916c30c54 -s ours
Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36
Jeff Sharkey [Wed, 11 Oct 2017 20:59:51 +0000 (20:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee
am:
e62d479921 -s ours
Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257
Jeff Sharkey [Wed, 11 Oct 2017 20:58:32 +0000 (20:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c
am:
5d60a49d63
Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8
Jeff Sharkey [Wed, 11 Oct 2017 20:44:45 +0000 (20:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9
am:
d20cad62ee
Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042
Jeff Sharkey [Wed, 11 Oct 2017 20:42:42 +0000 (20:42 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9
am:
7555eb508c
Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d
Jeff Sharkey [Wed, 11 Oct 2017 20:32:40 +0000 (20:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
04b96d76a9
Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
Jeff Sharkey [Wed, 11 Oct 2017 20:31:35 +0000 (20:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
d87d2746a9
Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23
TreeHugger Robot [Wed, 11 Oct 2017 20:22:22 +0000 (20:22 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
TreeHugger Robot [Fri, 6 Oct 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Siyamed Sinir [Sat, 30 Sep 2017 00:37:54 +0000 (00:37 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307 am:
a4f6ca3e77
am:
85439e9114
Change-Id: Ic616bde55a3a60eec10d9330907e6d8164b76c86
Siyamed Sinir [Sat, 30 Sep 2017 00:28:19 +0000 (00:28 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307
am:
a4f6ca3e77
Change-Id: If3b713963f393b7a16352d03c28dced60e2df7db
Siyamed Sinir [Sat, 30 Sep 2017 00:22:03 +0000 (00:22 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c
am:
095eda9307
Change-Id: I4ff17f12c20f95efe68115cc3d6b7d5e9b47228c
Siyamed Sinir [Sat, 30 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile
am:
6d79675e0c
Change-Id: Icea573859a6d441e18665d9da855370582f2992a
Siyamed Sinir [Sat, 30 Sep 2017 00:03:48 +0000 (00:03 +0000)]
Fix ClipboardService device lock check for cross profile
am:
0595b5a94b
Change-Id: I6aeaaef43a8e8c5ede049ae9e97fbf6d0129bac4
Leon Scroggins III [Fri, 10 Mar 2017 15:50:33 +0000 (10:50 -0500)]
Stop explicitly using kCallerPasses_Ownership
Bug:
65646012
Bug:
65426286
Cherry-picked from master. The original CL just updates BitmapFactory.
This also updates ExifInterface in the same way. ExifInterface.cpp no
longer existed by the time the Skia change landed.
Required for Ib7aaf367f68f8764147887d858f65ee14fa7a1d9, which fixes
the aforementioned bugs.
Test: No change in behavior, no new tests.
This enum is going away in https://skia-review.googlesource.com/c/9498,
and this method is using the default anyway.
Merged-In: I928a72851f90e84f45ce2fa49560f8ba894a8058
Merged-In: I8f6c761e50cb29476dc0784f58908ec35e3c70e9
Change-Id: I928a72851f90e84f45ce2fa49560f8ba894a8058
Beverly Tai [Thu, 14 Sep 2017 16:40:01 +0000 (16:40 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
Beverly Tai [Thu, 14 Sep 2017 14:35:34 +0000 (14:35 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c
am:
d54bc6a908 -s ours
Change-Id: Ie91e9f362cc247babdc4cfc8eee7f75b647107c2
Beverly Tai [Thu, 14 Sep 2017 14:29:56 +0000 (14:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee
am:
97b98a3b1c
Change-Id: If39d33d4c5b9e1057c7cdfd9b9b52f42d4b193d2
Beverly Tai [Thu, 14 Sep 2017 14:25:02 +0000 (14:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
am:
8150eb82ee
Change-Id: I85a98e8c857c9c7b7597fafb13ecb6ae44cb9b69
Beverly Tai [Thu, 14 Sep 2017 14:18:07 +0000 (14:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
Beverly Tai [Thu, 14 Sep 2017 13:11:10 +0000 (13:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
Siyamed Sinir [Wed, 13 Sep 2017 23:32:21 +0000 (16:32 -0700)]
Fix ClipboardService device lock check for cross profile
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.
Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest
Bug:
64934810
Change-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6
Merged-In: I712abfe8d542cd1be9c1816f407c8912321ac480
Siyamed Sinir [Wed, 13 Sep 2017 22:09:24 +0000 (15:09 -0700)]
Fix ClipboardService device lock check for cross profile
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.
Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest
Bug:
64934810
Change-Id: Iffc8e73dd3ee14a94958bb50dd11a696eab7f052
Suprabh Shukla [Wed, 13 Sep 2017 20:21:09 +0000 (20:21 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
am:
271702fc28
Change-Id: I4943cf417be41679c2fa332223825dd01a477814
Suprabh Shukla [Mon, 11 Sep 2017 22:20:35 +0000 (22:20 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
Fixing the original change which was reverted. Using the
available api Context.getSystemService(String) instead of
the unavailable Context.getSystemService(Class)
Test: cts-tradefed run cts -p android.content.syncmanager
Bug:
35028827
This reverts commit
4a9d358448ef150cae259e9c5b5ed1227a1d6d9c.
Change-Id: I725430401eaec861f45bb91ee1352bb1307a6915
Beverly Tai [Tue, 12 Sep 2017 16:15:49 +0000 (16:15 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec
am:
c64209fb6a -s ours
Change-Id: I8fdcba43f18249ca30843ab780f1cb945c068e37
Beverly Tai [Tue, 12 Sep 2017 16:09:38 +0000 (16:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6
am:
ff058a78ec
Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef
Beverly Tai [Tue, 12 Sep 2017 16:01:36 +0000 (16:01 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours
am:
d0d0fea3d6
Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf
Beverly Tai [Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am:
89a94b706d -s ours
Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36
Beverly Tai [Tue, 12 Sep 2017 15:29:21 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
Beverly [Thu, 7 Sep 2017 18:25:02 +0000 (14:25 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Ic7a81cf130fc70bc18f6990a662e921eb0d22635
Beverly [Wed, 6 Sep 2017 17:24:46 +0000 (13:24 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: I1a2150b795425a68ad45ee0134e31a317076d806
Beverly [Fri, 1 Sep 2017 15:14:57 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: I02f615624b33c3fb6e2fbb15ce44a0032b6f4387
Beverly [Fri, 1 Sep 2017 15:14:03 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89
Beverly Tai [Tue, 12 Sep 2017 14:11:10 +0000 (14:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev
am:
e1adf2240f -s ours
Change-Id: I02b0df60257429b5f2ed4ce2f0f4ee817abf585c
Beverly Tai [Tue, 12 Sep 2017 14:03:19 +0000 (14:03 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev
Beverly [Thu, 31 Aug 2017 19:32:36 +0000 (15:32 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: I52e27f84338fdcf63cad0ee7436233736499d87b
Siyamed Sinir [Tue, 12 Sep 2017 00:09:18 +0000 (00:09 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635
am:
064bfd22be
Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498
am:
6352ced635
Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6
am:
028ad8d498
Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am:
06183a57a6
Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
Siyamed Sinir [Mon, 11 Sep 2017 23:42:10 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev
am:
9f496fbbe0
Change-Id: Ibc57c285fec0bf1fcf560854971770e1353a88ac
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:30:34 +0000 (23:30 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev
Suprabh Shukla [Mon, 11 Sep 2017 22:25:29 +0000 (22:25 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts"
am:
4a9d358448
Change-Id: I3844594302279f859f7834a6bb29093162914ae6
Suprabh Shukla [Mon, 11 Sep 2017 19:50:51 +0000 (19:50 +0000)]
Revert "Clearing up invalid entries when SyncStorageEngine starts"
API getSystemService(Class) was not present in lmp-dev.
This reverts commit
89c0dbca0f52987571b62e929f114f3126c29455.
Bug:
35028827
Change-Id: I19846d2a3ee27aecbae2367a74ee49082eea154d
Tony Mak [Mon, 11 Sep 2017 10:38:07 +0000 (11:38 +0100)]
resolve merge conflicts of
56a2b529373b to nyc-dev
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Change-Id: I81183e5b5bc702fb245a6a51afe6709c5b9dd3de
Tony Mak [Mon, 11 Sep 2017 08:44:22 +0000 (08:44 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c am:
a1cbcf5513
am:
220e7c1628
Change-Id: Ib882539bf0f362d3dbd279418d37b8fd56a9d8f1
Tony Mak [Mon, 11 Sep 2017 08:36:08 +0000 (08:36 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c
am:
a1cbcf5513
Change-Id: I37cafa9ee6e166e27c074e6317a6a818fe9e87a5