Commit Graph

19560 Commits

Author SHA1 Message Date
Siyamed Sinir
9422f6e991 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf am: eb863a6b2e
am: b353fbcb7a

Change-Id: Iba3d14106f47f98643a6a02b67bcc14437755217
2017-10-31 17:41:58 +00:00
Siyamed Sinir
b353fbcb7a Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf
am: eb863a6b2e

Change-Id: Iacb16edfcc470e3f030324ee75e6eb623ee2c91c
2017-10-31 17:18:57 +00:00
Siyamed Sinir
eb863a6b2e Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856
am: eeb90235bf

Change-Id: I3125788140ad50b492d4f361b77db1d187f7c952
2017-10-31 17:05:15 +00:00
Siyamed Sinir
eeb90235bf Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b
am: bc56010856

Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026
2017-10-31 16:53:16 +00:00
Siyamed Sinir
bc56010856 Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03
am: 1f8536653b

Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
2017-10-31 16:42:29 +00:00
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
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
e62d479921 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9
am: d20cad62ee

Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042
2017-10-11 20:44:45 +00:00
Jeff Sharkey
b4d23d55c2 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am: 9d3706046c

Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef
2017-10-11 20:34:50 +00:00
Jeff Sharkey
4a60106aa0 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am: 254369967a

Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
2017-10-11 20:34:48 +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
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
Jeff Sharkey
c4f4dfedf8 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:22:06 +00:00
Jeff Sharkey
a20eb2a4c6 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:21:46 +00:00
Siyamed Sinir
7c7945c959 Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114 am: 17735f183a am: d93f91a137
am: 9865205a4e

Change-Id: I7c34d6b58d5aacadd6efa07ce12f9b7e9898768a
2017-09-30 01:07:30 +00:00
Siyamed Sinir
9865205a4e Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114 am: 17735f183a
am: d93f91a137

Change-Id: If4bb2848e0df71257a1f7e162524ebd08a5dad4d
2017-09-30 00:58:30 +00:00
Siyamed Sinir
d93f91a137 Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77 am: 85439e9114
am: 17735f183a

Change-Id: I71795f8f2f454956797ffaa78d22ca3573e5d626
2017-09-30 00:51:02 +00:00
Siyamed Sinir
17735f183a Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307 am: a4f6ca3e77
am: 85439e9114

Change-Id: Ic616bde55a3a60eec10d9330907e6d8164b76c86
2017-09-30 00:37:54 +00:00
Siyamed Sinir
85439e9114 Fix ClipboardService device lock check for cross profile am: 6d79675e0c am: 095eda9307
am: a4f6ca3e77

Change-Id: If3b713963f393b7a16352d03c28dced60e2df7db
2017-09-30 00:28:19 +00: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
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
4d91e69c82 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74
am: 5288fcc242

Change-Id: If564d9a1c4feb66163994ffb51233ce589df2465
2017-09-12 00:31:18 +00:00
Siyamed Sinir
5288fcc242 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e
am: 954b6e9b74

Change-Id: Ic5a041376b5f921b68f85c397b9b56440d11697c
2017-09-12 00:23:53 +00:00
Siyamed Sinir
954b6e9b74 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be
am: 8393b54d3e

Change-Id: If5b7319d2514ce67467d6092c99a4661155938e0
2017-09-12 00:16:19 +00:00
Siyamed Sinir
8393b54d3e Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635
am: 064bfd22be

Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b
2017-09-12 00:09:18 +00:00
Siyamed Sinir
064bfd22be Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498
am: 6352ced635

Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a
2017-09-12 00:00:54 +00:00
Siyamed Sinir
6352ced635 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6
am: 028ad8d498

Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
2017-09-11 23:50:20 +00:00
Siyamed Sinir
028ad8d498 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am: 06183a57a6

Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
2017-09-11 23:42:42 +00:00
Siyamed Sinir
06183a57a6 Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev 2017-09-11 23:31:44 +00:00
Suprabh Shukla
4f31a88d4b Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124
am: 25ec24740b

Change-Id: I858f75717157bd9269bcd43d4198935302132d5a
2017-09-10 20:01:33 +00:00
Suprabh Shukla
4b8fb78007 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361
am: 54f494ffc0

Change-Id: Ibbdf82686d13d9a554ef62774f140c57115118a3
2017-09-10 20:00:05 +00:00
Suprabh Shukla
25ec24740b Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229
am: 7d9e844124

Change-Id: Ifc197fbb16e1bb6773b2f08c7c62ca92f82238f7
2017-09-10 19:48:10 +00:00
Suprabh Shukla
54f494ffc0 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73
am: bf1b308361

Change-Id: Ia01d70256824947bed5e88e103bc263749404fbb
2017-09-10 19:47:46 +00:00
Suprabh Shukla
7d9e844124 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
am: fc9e382229

Change-Id: I80e814ed0266b3868bd7039508bbc50b2e2a51aa
2017-09-10 19:32:22 +00:00
Suprabh Shukla
bf1b308361 Clearing up invalid entries when SyncStorageEngine starts
am: 5470469d73

Change-Id: I8ffaaf35be0e2586a5bdbbe5de6e6bd440e26017
2017-09-10 19:32:12 +00:00
TreeHugger Robot
fc9e382229 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev 2017-09-10 19:25:54 +00:00
Siyamed Sinir
0b8fa2f5e0 Prevent getting data from Clipboard if device is locked
Clipboard should not return data if the device is locked. This CL checks
for device locked state before returning values from get/has functions.

Bug: 64934810
Change-Id: I856a9079fe64db0af44383fae1a9a418de959420
Merged-In: Icefac226615fe22a7735dff4ba4c3b528fb2ac12
2017-09-07 06:48:08 +00:00
Suprabh Shukla
5470469d73 Clearing up invalid entries when SyncStorageEngine starts
Any app with permission WRITE_SYNC_SETTINGS could write sync settings
for authorities or accounts that are not valid. This results in invalid
data being persisted to disk which can effectively lead to a DOS style
attack. Clearing such entries on boot will make sure that a reboot fixes
any such issues.

Test: cts-tradefed run cts-dev -m CtsSyncContentHostTestCases

Bug: 35028827
Change-Id: I9e206a42508e3cba65d7523bf47fff743f47dcb2
Merged-In: I9e206a42508e3cba65d7523bf47fff743f47dcb2
(cherry picked from commit 042a478b73)
2017-09-05 19:43:46 -07:00
Julius D'souza
1f3da1c8b9 DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate.
Some devices have catastrophic firmware issues in switching the sensor rate;
for these devices, the sensor rate switch should be skipped entirely.

Change-Id: I04fc3d27c99f95b33f86f012a8d398f817f7713a
2017-09-05 10:20:51 -07:00
Zheng Zhang
03c0f16f37 DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.

For non-master branch, only listen to Bluetooth on wearable device.

Bug: 64881794

Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.

Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit d6886710b5)
2017-08-28 23:23:07 +00:00
Kevin Tang
63a04f0d8c DO NOT MERGE ANYWHERE: GnssLocationProvider: listening to conn lost event
The HAL layer now gets onLost notificaiton as well
as connectivity available.  This keeps HAL layer
better informed on what the on what the real
connection status is, for things like assistance
download.

Fixes: 34076506
Test: GPS works, even after delete all, and assistance
downloads wait politely when in airplane mode.

Change-Id: I4b5fb782f9370b0a45282c8a9dd5920120d449fb
2017-08-23 18:22:59 +00:00
Wyatt Riley
081877bc6a DO NOT MERGE ANYWHERE: Restoring Network Available Notification to AGnssRil
Bug: 33350903
Change-Id: I8fe0ddbd011689258890ce37e37271cc6f170c6a
Fixes: 33350903
Test: On device GPS-still-works check (Ril check to be done by partners)
2017-08-23 18:18:46 +00:00
Zheng Zhang
9468b48565 Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug: 64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
2017-08-07 17:07:39 -07:00
Wei Wang
2ed0166808 Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.

Test: manual

Bug: 37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
2017-08-07 17:06:30 -07:00
Maggie Lee
33676dddbd Merge "power: gps: add gps read timeout" into cw-f-dev 2017-08-01 14:31:23 +00:00
Andriy Naborskyy
f18599a15b Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
  DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
  DO NOT MERGE ANYWHERE ConnectivityService: safer locking
2017-08-01 14:16:30 +00:00
Tyler Freeman
a053eaa841 Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev 2017-08-01 01:10:44 +00:00