Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,676 Commits 3 Branches 0 Tags
1f8536653bcbb6dee3160ffb6fd6bf3320185cd4
Commit Graph

203676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siyamed Sinir
1f8536653b Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a 
am: c275b77b03

Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
 2017-10-31 16:34:29 +00:00
Siyamed Sinir
c275b77b03 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev 
am: a0c253d07a

Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1
 2017-10-31 16:25:26 +00:00
Siyamed Sinir
a0c253d07a Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev 2017-10-31 16:17:06 +00:00
Jeff Sharkey
2f8dbe9693 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb 
am: 9c441159f9

Change-Id: I3533fdd4683cb85f66e107c3b4038f1a7ec97dfc
 2017-10-19 22:58:37 +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
Siyamed Sinir
4c7113461f Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 
am: 63bb54738d

Change-Id: Ie5bd667854712446924704bc839e80bb66d06a63
 2017-10-19 22:34:08 +00:00
Jeff Sharkey
9c441159f9 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours 
am: 08bd3a75fb

Change-Id: I18e61b7280df672c91bb076f3ed894f895e075a0
 2017-10-19 22:32:13 +00:00
Jeff Sharkey
563ea682e7 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours 
am: b52056d549

Change-Id: I520162dc90c1855d0a6324e62507f78d6ce5b329
 2017-10-19 22:25:25 +00:00
Siyamed Sinir
63bb54738d Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours 
am: 1c7cdde2d3

Change-Id: Iee9737ebbb5e9f3d476ddb54d9ae9898b2d01d14
 2017-10-19 22:16:30 +00:00
Jeff Sharkey
08bd3a75fb DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours 
am: edb6b17ebc  -s ours

Change-Id: Ie31aff669dfbabd860c123d4448362af4903973d
 2017-10-19 22:14:01 +00:00
Jeff Sharkey
b52056d549 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. 
am: 1f2a5d3622  -s ours

Change-Id: I2bf88a0e4808e7d3db67e7944696121c284ed7ae
 2017-10-19 22:10:20 +00:00
Siyamed Sinir
1c7cdde2d3 Fix ClipboardService device lock check for cross profile am: 0595b5a94b 
am: 9e5a4ed6c3  -s ours

Change-Id: Ie6822b787e5777688faadcf125637b9c66c202de
 2017-10-19 22:04:10 +00:00
Beverly Tai
06bd19c1fb Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b 
am: d7ece4da2c

Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f
 2017-10-19 21:50:59 +00:00
Suprabh Shukla
8fb52c8d06 Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 
am: 6f0e6952ef

Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240
 2017-10-19 21:41:08 +00:00
Beverly Tai
d7ece4da2c Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours 
am: dfbaa1fd8b

Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753
 2017-10-19 21:35:03 +00:00
Suprabh Shukla
6f0e6952ef Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours 
am: 159648d6e5

Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23
 2017-10-19 21:25:06 +00:00
Beverly Tai
dfbaa1fd8b Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev 
am: f2b592726d  -s ours

Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0
 2017-10-19 21:18:55 +00:00
Suprabh Shukla
159648d6e5 Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 
am: 8b438236ce  -s ours

Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec
 2017-10-19 20:57:26 +00:00
Beverly Tai
d34366e714 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
 2017-10-19 01:48:33 +00:00
Siyamed Sinir
c26e04b006 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
 2017-10-19 01:39:57 +00:00
Beverly Tai
3d600ede6d 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
 2017-10-19 01:38:56 +00:00
Siyamed Sinir
b24023a7e0 Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours 
am: dcdb0e6bbe

Change-Id: I245194dbfd5da9eb5f5d13977b12b5dde39c1bb2
 2017-10-19 01:30:16 +00:00
Beverly Tai
01ae445966 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f -s ours 
am: 3ca0cc0ae6  -s ours

Change-Id: Id5662a7d789e3e17e365d99b439cc8e8ab5d1c37
 2017-10-19 01:23:57 +00:00
Siyamed Sinir
dcdb0e6bbe Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 
am: 4973227cbf  -s ours

Change-Id: I9f53bf5a896885860e204764a8a282f77eff50cd
 2017-10-19 01:20:25 +00:00
Suprabh Shukla
57bbf9bb9c Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 
am: 2d194e5958

Change-Id: I669966eb694623fe3052db84dd1dc6375e1bfde9
 2017-10-19 00:28:13 +00:00
Suprabh Shukla
2d194e5958 Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 am: 0597a93629 -s ours 
am: d2455f8fa2

Change-Id: I20c7da32465a525b0a0bcd21f862a0a49cf727cb
 2017-10-19 00:18:17 +00:00
Suprabh Shukla
d2455f8fa2 Revert "Clearing up invalid entries when SyncStorageEngine starts" am: 4a9d358448 
am: 0597a93629  -s ours

Change-Id: I08d261935eb00ae8e8a929ff9ab54f6ec48fac88
 2017-10-19 00:07:54 +00:00
Suprabh Shukla
88f4c765a6 Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036 -s ours am: 5bd2c48ac0 -s ours 
am: 54cbf03ecb  -s ours

Change-Id: I500740d20bb4ee1b9cdb2de29387377e02be5872
 2017-10-18 18:36:52 +00:00
Suprabh Shukla
54cbf03ecb Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036 -s ours 
am: 5bd2c48ac0  -s ours

Change-Id: Ib09d2326565a43d3ff0c4d0a88041703658a8804
 2017-10-18 18:19:39 +00:00
Suprabh Shukla
5bd2c48ac0 Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f 
am: 53a2e46036  -s ours

Change-Id: Ic0fa17750a252a75912c4a2da73d45ff9a9fea1d
 2017-10-18 18:04:15 +00:00
Fyodor Kupolov
ded7332328 Use calling user ID when calling isDeviceLocked 
If isDeviceLocked is called with clearCallingIdentity,
original userId should be explicitly passed

Bug: 67621847
Test: Manual
Change-Id: I2bcb92572898811cc96bda1149ef806e6239e929
 2017-10-16 20:56:18 +00:00
Jeff Sharkey
edb6b17ebc DO NOT MERGE. KEY_INTENT shouldn't grant permissions. 
am: ca7ffa06bc  -s ours

Change-Id: I306c63c1922f29f1df3cb225bd2d3153cadecaa3
 2017-10-11 22:55:00 +00:00
Jeff Sharkey
5d60a49d63 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 
am: 7555eb508c

Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d
 2017-10-11 20:42:42 +00:00
Jeff Sharkey
d20cad62ee DO NOT MERGE. KEY_INTENT shouldn't grant permissions. 
am: 04b96d76a9

Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
 2017-10-11 20:32:40 +00:00
Jeff Sharkey
7555eb508c DO NOT MERGE. KEY_INTENT shouldn't grant permissions. 
am: d87d2746a9

Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23
 2017-10-11 20:31:35 +00:00
Jeff Sharkey
ca7ffa06bc 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
 2017-10-03 21:47:15 +00:00
Jeff Sharkey
1f2a5d3622 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
 2017-10-03 21:46:58 +00:00
Jeff Sharkey
d87d2746a9 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
 2017-10-03 21:46:42 +00:00
Jeff Sharkey
04b96d76a9 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
 2017-10-03 15:42:56 -06:00
Siyamed Sinir
a4f6ca3e77 Fix ClipboardService device lock check for cross profile am: 6d79675e0c 
am: 095eda9307

Change-Id: I4ff17f12c20f95efe68115cc3d6b7d5e9b47228c
 2017-09-30 00:22:03 +00:00
Siyamed Sinir
095eda9307 Fix ClipboardService device lock check for cross profile 
am: 6d79675e0c

Change-Id: Icea573859a6d441e18665d9da855370582f2992a
 2017-09-30 00:12:41 +00:00
Siyamed Sinir
9e5a4ed6c3 Fix ClipboardService device lock check for cross profile 
am: 0595b5a94b

Change-Id: I6aeaaef43a8e8c5ede049ae9e97fbf6d0129bac4
 2017-09-30 00:03:48 +00:00
Beverly Tai
97b98a3b1c Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev 
am: 8150eb82ee

Change-Id: I85a98e8c857c9c7b7597fafb13ecb6ae44cb9b69
 2017-09-14 14:25:02 +00:00
Beverly Tai
8150eb82ee Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev 2017-09-14 14:18:07 +00:00
Beverly Tai
f2b592726d Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev 2017-09-14 13:11:10 +00:00
Siyamed Sinir
6d79675e0c 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
 2017-09-14 00:59:49 +00:00
Siyamed Sinir
0595b5a94b 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
 2017-09-13 15:09:24 -07:00
Suprabh Shukla
8b438236ce Clearing up invalid entries when SyncStorageEngine starts 
am: 271702fc28

Change-Id: I4943cf417be41679c2fa332223825dd01a477814
 2017-09-13 20:21:09 +00:00
Suprabh Shukla
271702fc28 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 4a9d358448.

Change-Id: I725430401eaec861f45bb91ee1352bb1307a6915
 2017-09-12 15:06:59 -07:00
Beverly Tai
ff058a78ec Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours 
am: d0d0fea3d6

Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf
 2017-09-12 16:01:36 +00:00