Commit Graph

29020 Commits

Author SHA1 Message Date
Phil Weaver
9625d164e4 Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56
am: 0ddd7e4714

Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f
2017-07-18 23:35:25 +00:00
Phil Weaver
0ddd7e4714 Merge "Back-port fixes for b/62196835" into mnc-dev
am: 093c7a8e56

Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53
2017-07-18 23:28:55 +00:00
Phil Weaver
d4a5fd1ce3 Back-port fixes for b/62196835
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-17 16:36:34 -07:00
Svetoslav Ganov
cc0ec4d292 Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am: c8dac8d6f6
am: 84e1238ed6

Change-Id: I2c912b8363a6ca8a12e1c56ae5f1956a4ba5dc07
2017-03-09 19:32:59 +00:00
Svetoslav Ganov
84e1238ed6 Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev
am: c8dac8d6f6

Change-Id: I597b43bb7218779d55c0b11af79daef128d199f2
2017-03-09 19:26:50 +00:00
TreeHugger Robot
c8dac8d6f6 Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev 2017-03-09 19:19:43 +00:00
Svetoslav Ganov
8b943f40b6 [DO NOT MERGE] Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.

Test: Added a CTS test which passes.

Bug: 33860747

Change-Id: I4e86ee54e61d2fa45be601fae577986ef9a84673
2017-03-09 19:16:08 +00:00
Jeff Sharkey
75f767afa1 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9
am: 32c71b078c

Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
2017-02-12 09:51:37 +00:00
Jeff Sharkey
32c71b078c DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am: 3f3da42ef9

Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
2017-02-12 09:47:33 +00:00
Jeff Sharkey
3f3da42ef9 DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9)
2017-02-07 04:43:24 +00:00
Jeff Sharkey
9434773306 DO NOT MERGE. No direct Uri grants from system.
am: b18bd06e94

Change-Id: Ia946b314e7c12c5a04f6c117a9b2e2537fc006e9
2017-02-03 00:12:08 +00:00
Jeff Sharkey
e6be8d765f Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev 2017-02-02 23:59:47 +00:00
Jeff Sharkey
7115ad7119 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev 2017-02-02 23:59:46 +00:00
Jack Yu
fab95f8ad6 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746
am: 426f454b69

Change-Id: I063d17c3eeb6f5b6ec32c261b22ccea273c572ea
2017-02-02 22:36:03 +00:00
Jack Yu
426f454b69 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10
am: 413922e746

Change-Id: I8664d6e42113b4c22741b06780727b10c2e6804e
2017-02-02 22:31:29 +00:00
Jack Yu
413922e746 Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564
am: 40d0753b10

Change-Id: I1f8a897862c69a475c6d12a824bd69ed8692cd99
2017-02-02 22:26:09 +00:00
Jack Yu
40d0753b10 Fixed the logic for tethering provisioning re-evaluation
am: 91a0bc9564

Change-Id: I4c499b756c019d83a61e61da3065f31a4d8672f2
2017-02-02 22:21:00 +00:00
Jeff Sharkey
bac46f5b65 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:12:20 +00:00
Jeff Sharkey
b18bd06e94 DO NOT MERGE. No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296, 32990341, 32879915, 32879772
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2017-02-02 07:11:55 +00:00
Suprabh Shukla
2e6bdbeaab DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8
am: ab8d3febd3

Change-Id: If42411391fe2010162c51adf48e720e308a650ec
2017-02-02 02:28:13 +00:00
Suprabh Shukla
ab8d3febd3 DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 4ffe72dcc8

Change-Id: Ic7b9ef6484df0b57c8f1ee7a483ef3bda05c7cc7
2017-02-02 02:21:16 +00:00
Suprabh Shukla
4ffe72dcc8 DO NOT MERGE Do not call RecoverySystem with DPMS lock held
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.

Bug 30681079

Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
2017-01-31 13:01:36 -08:00
Jack Yu
91a0bc9564 Fixed the logic for tethering provisioning re-evaluation
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)

Test: Manual
bug: 33815946

Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
2017-01-16 10:53:28 -08:00
Charles He
0cc0219089 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2
am: 76ca2da7e8

Change-Id: I9e20b2954ccb462cee31cb5ea44986c00afadbff
2016-12-29 10:20:47 +00:00
Charles He
e5156ec1e9 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611
am: 00a581f882

Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
2016-12-29 10:18:49 +00:00
Charles He
76ca2da7e8 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f
am: 6aa436bef2

Change-Id: I994b2fe070091a32beffff9dbf11b907b7878fe8
2016-12-29 10:13:27 +00:00
Charles He
00a581f882 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d
am: 133ff4d611

Change-Id: I54b163f645f561243aac3df1a55c1023531997b3
2016-12-29 10:11:20 +00:00
Charles He
6aa436bef2 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9
am: d0339c6e8f

Change-Id: I0dbec3edf704821eb4605a48b770461eb99ddae7
2016-12-29 10:06:14 +00:00
Charles He
133ff4d611 Prevent writing to FRP partition during factory reset. am: a9437bd1ca
am: 2ce5c4320d

Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7
2016-12-29 10:03:53 +00:00
Charles He
d0339c6e8f Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
am: 71d2a41dd9

Change-Id: Iab575b1efdd720c9cf9e32e0b056c99eff98deab
2016-12-29 09:50:20 +00:00
Charles He
2ce5c4320d Prevent writing to FRP partition during factory reset.
am: a9437bd1ca

Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
2016-12-29 09:48:45 +00:00
Charles He
63a27d773b Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev 2016-12-29 09:43:14 +00:00
Charles He
4bd97eb888 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev 2016-12-29 09:42:30 +00:00
Tom O'Neill
1ac8affd51 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66
am: d82f8a67fc

Change-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86
2016-12-22 17:34:11 +00:00
Tom O'Neill
d82f8a67fc Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2
am: 1f458fdc66

Change-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc
2016-12-22 17:29:05 +00:00
Tom O'Neill
1f458fdc66 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344
am: d28eef0cc2

Change-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d
2016-12-22 17:23:39 +00:00
Tom O'Neill
d28eef0cc2 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b
am: 1684e5f344

Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e
2016-12-22 17:19:10 +00:00
Tom O'Neill
1684e5f344 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516
am: 0a8978f04b

Change-Id: I693665a57465ec57f946fad57cda9ce48389408f
2016-12-22 17:14:05 +00:00
Tom O'Neill
0a8978f04b Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872
am: 3380a77516

Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423
2016-12-22 17:09:09 +00:00
Tom O'Neill
3380a77516 Fix exploit where can hide the fact that a location was mocked am: a206a0f17e
am: d417e54872

Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db
2016-12-22 17:04:07 +00:00
Tom O'Neill
a206a0f17e Fix exploit where can hide the fact that a location was mocked
- Even if call setTestProviderLocation() with inconsistent providers,
should still end up with a location that is flagged as mocked

- Bug: 33091107

Change-Id: I39e038f25b975989c2e8651bfd9ec9e74073e6cd
2016-12-15 10:26:28 -08:00
Julius D'souza
e6f8cb29ec fix case issues with mGoingIdleWakeLock in DeviceIdleController
Bug: 31900521

Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c
2016-12-14 10:31:12 -08:00
Charles He
71d2a41dd9 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
Change-Id: I1024f2a56badde5c123d025d6fe02f42559cbcb1
Test: manual
Bug: 30352311
(cherry picked from commit f6f1d62748)
2016-12-14 13:28:55 +00:00
Charles He
a9437bd1ca Prevent writing to FRP partition during factory reset.
Avoid potential race condition between FRP wipe and write operations
during factory reset by making the FRP partition unwritable after
wipe.

Bug: 30352311
Test: manual
Change-Id: If3f024a1611366c0677a996705724458094fcfad
(cherry picked from commit a629c772f4)
2016-12-14 12:08:30 +00:00
Julius D'souza
f9f39cc4a8 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController
is going idle.

The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it.  But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.

It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.

Bug: 31900521
Change-Id: I706045aa189147824c9214c57abc13993aee9a5b
2016-12-13 18:28:31 -08:00
Jeff Sharkey
792d49dfb5 DO NOT MERGE. Check provider access for content changes.
am: 91add43ae7

Change-Id: I158a5dab0643fb5d2c07393f0df030e93b3c006a
2016-12-02 18:19:51 +00:00
Jeff Sharkey
7340749c2a DO NOT MERGE: Check provider access for content changes.
am: ff2fede0dd

Change-Id: I7de766d1acc1f20e83f07953dedfe3810f906db8
2016-12-02 18:19:42 +00:00
Jeff Sharkey
6b89229d14 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev 2016-12-02 18:10:16 +00:00
Jeff Sharkey
ae7d4b1339 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev 2016-12-02 18:10:15 +00:00
Jeff Sharkey
48f6bdfce4 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev 2016-12-02 18:10:14 +00:00