OSDN Git Service
Fyodor Kupolov [Thu, 9 Mar 2017 19:57:49 +0000 (19:57 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am:
07beec953b am:
4707bd455e
am:
4fa88b4ddb
Change-Id: I133348d3f7dd0d9fbc6a24b9e23bd118986fb6d1
Fyodor Kupolov [Thu, 9 Mar 2017 19:51:56 +0000 (19:51 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am:
07beec953b
am:
4707bd455e
Change-Id: I5ad21560d103ccd099c8c82b591bdd432bad50aa
Fyodor Kupolov [Thu, 9 Mar 2017 19:43:55 +0000 (19:43 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev
am:
07beec953b
Change-Id: Ia5853c9741163b5e38a432ca645e4082bfa0a7bb
Svetoslav Ganov [Thu, 9 Mar 2017 19:39:51 +0000 (19:39 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am:
c8dac8d6f6 am:
84e1238ed6
am:
cc0ec4d292
Change-Id: Ic65e41e08606715cbbd953b77ef4066a8e047a7f
Fyodor Kupolov [Thu, 9 Mar 2017 19:35:27 +0000 (19:35 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev
Svetoslav Ganov [Thu, 9 Mar 2017 19:32:59 +0000 (19:32 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am:
c8dac8d6f6
am:
84e1238ed6
Change-Id: I2c912b8363a6ca8a12e1c56ae5f1956a4ba5dc07
Svetoslav Ganov [Thu, 9 Mar 2017 19:26:50 +0000 (19:26 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev
am:
c8dac8d6f6
Change-Id: I597b43bb7218779d55c0b11af79daef128d199f2
TreeHugger Robot [Thu, 9 Mar 2017 19:19:39 +0000 (19:19 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev
Svetoslav Ganov [Thu, 29 Dec 2016 22:40:11 +0000 (14:40 -0800)]
[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
Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]
[DO NOT MERGE] Check bounds in offsetToPtr
Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.
Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.
Test: manual - using the test app from the bug
Bug:
34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit
45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)
Jeff Sharkey [Sun, 12 Feb 2017 10:06:34 +0000 (10:06 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0
am:
9335807fc4
Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07
Jeff Sharkey [Sun, 12 Feb 2017 10:02:08 +0000 (10:02 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a
am:
00f5232dd0
Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
Jeff Sharkey [Sun, 12 Feb 2017 09:58:13 +0000 (09:58 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours
am:
48f1ddc94a
Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f
Jeff Sharkey [Sun, 12 Feb 2017 09:56:10 +0000 (09:56 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c
am:
75f767afa1
Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
Jeff Sharkey [Sun, 12 Feb 2017 09:53:38 +0000 (09:53 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9
am:
a0b1198e70 -s ours
Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902
Jeff Sharkey [Sun, 12 Feb 2017 09:51:37 +0000 (09:51 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9
am:
32c71b078c
Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
Jeff Sharkey [Sun, 12 Feb 2017 09:48:46 +0000 (09:48 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
6f754e48e9
Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c
Jeff Sharkey [Sun, 12 Feb 2017 09:47:33 +0000 (09:47 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3f3da42ef9
Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
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
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
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
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Fri, 3 Feb 2017 00:53:49 +0000 (00:53 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c am:
00af0a6d2c
am:
b4c5c522e3
Change-Id: Iae12207ee70e0212fce0f04a34891b7e20f7aeb0
Jeff Sharkey [Fri, 3 Feb 2017 00:50:28 +0000 (00:50 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730 am:
c0cc8695a5
am:
f51e8e8642
Change-Id: I94a2e244e7ab2d9571632f2d79fcce0ed38e3320
Jeff Sharkey [Fri, 3 Feb 2017 00:49:28 +0000 (00:49 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074 am:
8c9ff68173
am:
4b3c59005b
Change-Id: Ibc4221c090b1dab98c085486733c987d96c99210
Jeff Sharkey [Fri, 3 Feb 2017 00:48:41 +0000 (00:48 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5 am:
bd2bec9164
am:
1ddaf2f96b
Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf
Jeff Sharkey [Fri, 3 Feb 2017 00:43:16 +0000 (00:43 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours am:
4b0164b27c
am:
00af0a6d2c
Change-Id: I367da25f89c5c982f6eacaa1929dbbcbf15801f0
Jeff Sharkey [Fri, 3 Feb 2017 00:42:23 +0000 (00:42 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours am:
9346bec730
am:
c0cc8695a5
Change-Id: Ia0e1987122659a913145fc86a6626e0dd1890f24
Jeff Sharkey [Fri, 3 Feb 2017 00:40:52 +0000 (00:40 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours am:
f82c373074
am:
8c9ff68173
Change-Id: Iaa739f638e66376a2aa145a465255f738f9b3f1b
Jeff Sharkey [Fri, 3 Feb 2017 00:40:04 +0000 (00:40 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5
am:
bd2bec9164
Change-Id: I9d9889577061ada5de8c0213ec73d257469466e8
Jeff Sharkey [Fri, 3 Feb 2017 00:35:19 +0000 (00:35 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d am:
d20b04a41d -s ours
am:
4b0164b27c
Change-Id: I4dda89507d1003f82af6e204c9983732b36927da
Jeff Sharkey [Fri, 3 Feb 2017 00:34:33 +0000 (00:34 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb am:
61e9179646 -s ours
am:
9346bec730
Change-Id: I456a98abbdcb7d6f7d959a791da726f56f55edf8
Jeff Sharkey [Fri, 3 Feb 2017 00:33:40 +0000 (00:33 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530 am:
5d65931af5 -s ours
am:
f82c373074
Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99
Jeff Sharkey [Fri, 3 Feb 2017 00:32:49 +0000 (00:32 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours
am:
05749525a5
Change-Id: Id298d130a52b44ad9252f8a65c88bb63fbb86f7f
Jeff Sharkey [Fri, 3 Feb 2017 00:30:04 +0000 (00:30 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours am:
b058dc139d
am:
d20b04a41d -s ours
Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01
Jeff Sharkey [Fri, 3 Feb 2017 00:29:34 +0000 (00:29 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f am:
8f4f4daf2c
am:
7c0ea478a8
Change-Id: I5b1974499b3dba96134a14ab5b00a8942a02fe6f
Jeff Sharkey [Fri, 3 Feb 2017 00:29:13 +0000 (00:29 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours am:
4a4b6bfafb
am:
61e9179646 -s ours
Change-Id: Ibfdb4128b1db25db478f9b4cb987d0754ddd9124
Jeff Sharkey [Fri, 3 Feb 2017 00:28:43 +0000 (00:28 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65 am:
3da69c1115
am:
b5740f8c53
Change-Id: Ieca522b743bf9d1840b657b19a5a4f4ffe80a8fd
Jeff Sharkey [Fri, 3 Feb 2017 00:23:24 +0000 (00:23 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am:
6d3573e530
am:
5d65931af5 -s ours
Change-Id: I14933edb3f93eea4156698bb2669938849c30697
Jeff Sharkey [Fri, 3 Feb 2017 00:22:28 +0000 (00:22 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73
am:
73f95823f8 -s ours
Change-Id: I1361483ca420b86bf1adedfe297d4dcdf5121a18
Jeff Sharkey [Fri, 3 Feb 2017 00:22:16 +0000 (00:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:
7115ad7119
am:
fa22018223
Change-Id: Ifb220fbac07f4dcbb455080107ebc765611cf022
Jeff Sharkey [Fri, 3 Feb 2017 00:22:15 +0000 (00:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am:
3e4faac39f -s ours
am:
b058dc139d
Change-Id: Idd1aeb4749741aa8bae76cf43ce3f2bdceff077d
Jeff Sharkey [Fri, 3 Feb 2017 00:21:58 +0000 (00:21 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f
am:
8f4f4daf2c
Change-Id: I049f66856f9354432f722fd29248720d76e6c5e1
Jeff Sharkey [Fri, 3 Feb 2017 00:21:15 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94
am:
9434773306
Change-Id: I1dae5df31fbd29f96a3f8adf898fd6c7c716f56e
Jeff Sharkey [Fri, 3 Feb 2017 00:21:13 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
2dfdf662d0 -s ours
am:
4a4b6bfafb
Change-Id: Id479b2d27fd8396047312fe7259971c167b8d705
Jeff Sharkey [Fri, 3 Feb 2017 00:21:10 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65
am:
3da69c1115
Change-Id: I19ff97bb24c7cf985c8877b0c365f6eb4624fe80
Jeff Sharkey [Fri, 3 Feb 2017 00:12:45 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
am:
e6be8d765f
Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897
Jeff Sharkey [Fri, 3 Feb 2017 00:12:43 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
bac46f5b65
Change-Id: I87dbe96e14c68b5d99b43bf7ad3d653d5fb33a61
Jeff Sharkey [Fri, 3 Feb 2017 00:12:11 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
am:
7115ad7119
Change-Id: Ib9e5a56a4bac34dbf9ef3fc4122d4a2ac1e0bb7e
Jeff Sharkey [Fri, 3 Feb 2017 00:12:10 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
am:
6d3573e530
Change-Id: I501ff6230b9b5fa5d7232e52cfe326320c7edf65
Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
6f13f73b73
Change-Id: I28627832c3ec765d6761afbf3fc508d1069c9582
Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
b18bd06e94
Change-Id: Ia946b314e7c12c5a04f6c117a9b2e2537fc006e9
Jeff Sharkey [Fri, 3 Feb 2017 00:10:17 +0000 (00:10 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
am:
3e4faac39f -s ours
Change-Id: If1ea6da6679874ca13379222a28c529421c80b23
Jeff Sharkey [Fri, 3 Feb 2017 00:10:16 +0000 (00:10 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
2dfdf662d0 -s ours
Change-Id: Id06fac9dd096c1d821a1af7451db388446e9b156
Jeff Sharkey [Thu, 2 Feb 2017 23:59:42 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:43 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:40 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:39 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:38 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
Suprabh Shukla [Thu, 2 Feb 2017 23:37:25 +0000 (23:37 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am:
af85feef36 -s ours am:
d9c8155943 -s ours am:
bf1c88f34e -s ours am:
c1a0e6db4c -s ours am:
20756a97ea -s ours
am:
9394305cd7 -s ours
Change-Id: I15bd6695657f5bf7b802ad5b1119b63f669fc669
Suprabh Shukla [Thu, 2 Feb 2017 23:31:41 +0000 (23:31 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am:
af85feef36 -s ours am:
d9c8155943 -s ours am:
bf1c88f34e -s ours am:
c1a0e6db4c -s ours
am:
20756a97ea -s ours
Change-Id: I976532a5bc3d21d637da69e2f508eeb532ec1996
Suprabh Shukla [Thu, 2 Feb 2017 23:31:09 +0000 (23:31 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
14ed611912 -s ours am:
051f01700e -s ours am:
a3685e4bb5 -s ours am:
3f7ed73fdd -s ours am:
64e2b4f825 -s ours
am:
170f2b9e7a -s ours
Change-Id: I91a75624e85cf6f32538de378bac43367f118672
Suprabh Shukla [Thu, 2 Feb 2017 23:26:38 +0000 (23:26 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
14ed611912 -s ours am:
051f01700e -s ours am:
a3685e4bb5 -s ours am:
3f7ed73fdd -s ours
am:
64e2b4f825 -s ours
Change-Id: Ic1a85765c15ba86b594f7ba654d4a211db91e3a2
Suprabh Shukla [Thu, 2 Feb 2017 23:24:38 +0000 (23:24 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am:
af85feef36 -s ours am:
d9c8155943 -s ours am:
bf1c88f34e -s ours
am:
c1a0e6db4c -s ours
Change-Id: Ide2acd4e61618be87ad4c32d735a4cd7f3781d0b
Suprabh Shukla [Thu, 2 Feb 2017 23:21:37 +0000 (23:21 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
14ed611912 -s ours am:
051f01700e -s ours am:
a3685e4bb5 -s ours
am:
3f7ed73fdd -s ours
Change-Id: I42ed0e37dc68919a2a3e6b9b6aaa5030a90eca77
Suprabh Shukla [Thu, 2 Feb 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am:
af85feef36 -s ours am:
d9c8155943 -s ours
am:
bf1c88f34e -s ours
Change-Id: I75d702680bc6ef22e0f60a3c165cd310bf2bb6cf
Suprabh Shukla [Thu, 2 Feb 2017 23:17:06 +0000 (23:17 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
14ed611912 -s ours am:
051f01700e -s ours
am:
a3685e4bb5 -s ours
Change-Id: If22ee3dec4879f8324a66dea910bb65c9f6eda14
Suprabh Shukla [Thu, 2 Feb 2017 23:13:03 +0000 (23:13 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am:
af85feef36 -s ours
am:
d9c8155943 -s ours
Change-Id: I9dfff7471440739580e7827cdb4484fad6900048
Suprabh Shukla [Thu, 2 Feb 2017 23:12:05 +0000 (23:12 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
14ed611912 -s ours
am:
051f01700e -s ours
Change-Id: Idcf3ce991369a6e41a3c2bd3aa9cd16d909eea13
Suprabh Shukla [Thu, 2 Feb 2017 23:10:10 +0000 (23:10 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a am:
21992d997b am:
b278ed787e -s ours am:
ec3e2b9dcb -s ours am:
483b561f41 am:
6e850f85fc -s ours am:
bdeae85e54 am:
4e4dfacb7b
am:
c19d459e2a
Change-Id: I4b7d8869ecb9f1d8a52a0cccf59f8dee1f6c31dc
Suprabh Shukla [Thu, 2 Feb 2017 23:07:36 +0000 (23:07 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
am:
af85feef36 -s ours
Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b
Suprabh Shukla [Thu, 2 Feb 2017 23:07:34 +0000 (23:07 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
14ed611912 -s ours
Change-Id: I1645d15febdfffd76cd2c592241549c507db1185
Suprabh Shukla [Thu, 2 Feb 2017 23:05:09 +0000 (23:05 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a am:
21992d997b am:
b278ed787e -s ours am:
ec3e2b9dcb -s ours am:
483b561f41 am:
6e850f85fc -s ours am:
bdeae85e54
am:
4e4dfacb7b
Change-Id: I7dcba06623c993f0539729be69d97d338be2393f
Suprabh Shukla [Thu, 2 Feb 2017 23:00:07 +0000 (23:00 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a am:
21992d997b am:
b278ed787e -s ours am:
ec3e2b9dcb -s ours am:
483b561f41 am:
6e850f85fc -s ours
am:
bdeae85e54
Change-Id: I112366734c02695d69251e159fb97c523a9c0cf4
Suprabh Shukla [Thu, 2 Feb 2017 22:58:45 +0000 (22:58 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
Suprabh Shukla [Thu, 2 Feb 2017 22:56:23 +0000 (22:56 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a am:
21992d997b am:
b278ed787e -s ours am:
ec3e2b9dcb -s ours am:
483b561f41
am:
6e850f85fc -s ours
Change-Id: I1cfa1298cf0a1f4f53358242d639ff7f072bc273
Suprabh Shukla [Thu, 2 Feb 2017 22:50:32 +0000 (22:50 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a am:
21992d997b am:
b278ed787e -s ours am:
ec3e2b9dcb -s ours
am:
483b561f41
Change-Id: I065ff3640f19985157cd63c529019167c135489a
Suprabh Shukla [Thu, 2 Feb 2017 22:49:26 +0000 (22:49 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am:
3ced78bdda am:
aec526f710 -s ours am:
14e38a8b21 am:
429683b469
am:
ceb288f00b
Change-Id: I6594a2922340e20d226752f0b4a1e99aed7448cb
Suprabh Shukla [Thu, 2 Feb 2017 22:48:34 +0000 (22:48 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
835c8b3d69 am:
c22e6d15d1 -s ours am:
3a09dac9c4 am:
50c6d2ff56
am:
db40505c42
Change-Id: I97bba19262c03c223faf56505534c29f603d7671
Suprabh Shukla [Thu, 2 Feb 2017 22:45:36 +0000 (22:45 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a am:
21992d997b am:
b278ed787e -s ours
am:
ec3e2b9dcb -s ours
Change-Id: I76bf4d69d98374a90da3cd4c74f0c2d892504a40
Suprabh Shukla [Thu, 2 Feb 2017 22:43:58 +0000 (22:43 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am:
3ced78bdda am:
aec526f710 -s ours am:
14e38a8b21
am:
429683b469
Change-Id: I4998929bae9f510de4dc5828e136921a033ff98e
Suprabh Shukla [Thu, 2 Feb 2017 22:43:00 +0000 (22:43 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
835c8b3d69 am:
c22e6d15d1 -s ours am:
3a09dac9c4
am:
50c6d2ff56
Change-Id: I53ba07ec6cfa0c8617eae87a671d292a6b28f519
Suprabh Shukla [Thu, 2 Feb 2017 22:41:38 +0000 (22:41 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a am:
21992d997b
am:
b278ed787e -s ours
Change-Id: Ib70440bdd1c60ed5eaa9b8c8152a4745f44cacd6
Jack Yu [Thu, 2 Feb 2017 22:41:34 +0000 (22:41 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564 am:
40d0753b10 am:
413922e746 am:
426f454b69
am:
fab95f8ad6
Change-Id: I7c8ac34bfb4bf1bcf6323163ef872d83ee58bfcc
Suprabh Shukla [Thu, 2 Feb 2017 22:39:22 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am:
3ced78bdda am:
aec526f710 -s ours
am:
14e38a8b21
Change-Id: Ib5e1e997168d33810e36510bebe6783382211059
Suprabh Shukla [Thu, 2 Feb 2017 22:38:31 +0000 (22:38 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
835c8b3d69 am:
c22e6d15d1 -s ours
am:
3a09dac9c4
Change-Id: I7c001da58aee7ea4784a8fb8c8a2a2498bfba533
Jack Yu [Thu, 2 Feb 2017 22:36:03 +0000 (22:36 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564 am:
40d0753b10 am:
413922e746
am:
426f454b69
Change-Id: I063d17c3eeb6f5b6ec32c261b22ccea273c572ea
Suprabh Shukla [Thu, 2 Feb 2017 22:36:03 +0000 (22:36 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
8cdc04957a
am:
21992d997b
Change-Id: Ib5ba5eb63227be2fbf25a79e7f8f8e42b1cc9a2b
Suprabh Shukla [Thu, 2 Feb 2017 22:34:55 +0000 (22:34 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am:
3ced78bdda
am:
aec526f710 -s ours
Change-Id: I383f706dfc0690352c3b4d6358ed1269c15ed8b8
Suprabh Shukla [Thu, 2 Feb 2017 22:34:02 +0000 (22:34 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
835c8b3d69
am:
c22e6d15d1 -s ours
Change-Id: I80fa5e3991464bf99111c00b1074a4e5c7ef9130
Jack Yu [Thu, 2 Feb 2017 22:31:29 +0000 (22:31 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564 am:
40d0753b10
am:
413922e746
Change-Id: I8664d6e42113b4c22741b06780727b10c2e6804e
Suprabh Shukla [Thu, 2 Feb 2017 22:31:29 +0000 (22:31 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
8cdc04957a
Change-Id: I7c1b9e9f785ef99575136d9af0b062dad759c17a
Suprabh Shukla [Thu, 2 Feb 2017 22:29:02 +0000 (22:29 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
am:
3ced78bdda
Change-Id: I4da6e2894de769fb028ad713290b62e38925294a
Suprabh Shukla [Thu, 2 Feb 2017 22:28:59 +0000 (22:28 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
835c8b3d69
Change-Id: I080d11d3d7d6434b832f8ecb1ee93c17a6d7cb4a
Jack Yu [Thu, 2 Feb 2017 22:26:09 +0000 (22:26 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564
am:
40d0753b10
Change-Id: I1f8a897862c69a475c6d12a824bd69ed8692cd99
Suprabh Shukla [Thu, 2 Feb 2017 22:23:08 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
Jack Yu [Thu, 2 Feb 2017 22:21:00 +0000 (22:21 +0000)]
Fixed the logic for tethering provisioning re-evaluation
am:
91a0bc9564
Change-Id: I4c499b756c019d83a61e61da3065f31a4d8672f2
Jeff Sharkey [Mon, 21 Nov 2016 17:33:54 +0000 (10:33 -0700)]
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
Jeff Sharkey [Mon, 21 Nov 2016 17:33:54 +0000 (10:33 -0700)]
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
Jeff Sharkey [Mon, 21 Nov 2016 17:33:54 +0000 (10:33 -0700)]
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
Jeff Sharkey [Mon, 21 Nov 2016 17:33:54 +0000 (10:33 -0700)]
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
Jeff Sharkey [Mon, 21 Nov 2016 17:33:54 +0000 (10:33 -0700)]
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