OSDN Git Service
Jeff Sharkey [Fri, 3 Feb 2017 00:58:38 +0000 (00:58 +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
am:
bf16fab4e7 -s ours
Change-Id: Ie048d01183ce63035cfa63ab54414b40f0b2b2c7
Jeff Sharkey [Fri, 3 Feb 2017 00:57:39 +0000 (00:57 +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
am:
394357761e -s ours
Change-Id: I8330da471c2770612f2898339f567b05853a2479
Jeff Sharkey [Fri, 3 Feb 2017 00:56:34 +0000 (00:56 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
6f13f73b73 am:
73f95823f8 -s ours am:
05749525a5 am:
bd2bec9164 am:
1ddaf2f96b
am:
56131cf7c0 -s ours
Change-Id: I2ca1c4bc0585eee8759d74c5e2a0b90afcd987dc
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: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:34:57 +0000 (00:34 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am:
e6be8d765f am:
8f4f4daf2c am:
7c0ea478a8
am:
2848738526 -s ours
Change-Id: I7c56e83a5de15ec7d3432e3ca4ec385499069f40
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:34:04 +0000 (00:34 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65 am:
3da69c1115 am:
b5740f8c53
am:
4942836d3c -s ours
Change-Id: I72d83bb758c1b70a46eb244d93b932ea2dcf1cb4
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:57 +0000 (00:32 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am:
7115ad7119 am:
fa22018223
am:
8469d52d41 -s ours
Change-Id: Ib3b38a9c4dacf09aeec385e46b464598c0214a76
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:31:56 +0000 (00:31 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94 am:
9434773306
am:
bdb0c8fc17 -s ours
Change-Id: I2d00e5bd394e93e8b2ac218056f30225580f681b
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: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:31 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
am:
1f007d1471 -s ours
Change-Id: I5fb0f4d1ebf169c8e1309c1d7549d34b362c8328
Jeff Sharkey [Fri, 3 Feb 2017 00:12:26 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
021747a076 -s ours
Change-Id: Id5d516b36b7cafc364d49109813d12f73ddb4684
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: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: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
Jeff Sharkey [Thu, 2 Feb 2017 23:59:37 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
Suprabh Shukla [Thu, 2 Feb 2017 23:43:18 +0000 (23:43 +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
am:
9690f8899b -s ours
Change-Id: Ic815923ff5d6cafced9d155d7188acc4ba8c4d6a
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:35:42 +0000 (23:35 +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
am:
2b01e24b3f -s ours
Change-Id: I59f0209f21655e63bc06429861188aea1b2d16ee
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:14:43 +0000 (23:14 +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
am:
55176e2d5a -s ours
Change-Id: If9f0a189981a49d36662ad4e90d3278be35148d0
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:56:15 +0000 (22:56 +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
am:
5acc268372 -s ours
Change-Id: I2d8425f5da49ba7b1bd451f9ce5e15cfd423b7eb
Suprabh Shukla [Thu, 2 Feb 2017 22:55:08 +0000 (22:55 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
835c8b3d69 am:
c22e6d15d1 -s ours am:
3a09dac9c4 am:
50c6d2ff56 am:
db40505c42
am:
af7a739889 -s ours
Change-Id: Ie8ed7d0a8f45d4ad2ccd9f0db56499aa492b8cb8
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
Jack Yu [Thu, 2 Feb 2017 22:45:43 +0000 (22:45 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564 am:
40d0753b10 am:
413922e746 am:
426f454b69 am:
fab95f8ad6
am:
37d3b12aa1
Change-Id: I751c29efc17d371905f5d70460e65744c63ec1fc
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
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
Suprabh Shukla [Thu, 2 Feb 2017 02:38:24 +0000 (02:38 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab
am:
588411fc7c -s ours
Change-Id: I1511e5dff681d06161cd18b78e7edaf7eddb897a
Suprabh Shukla [Thu, 2 Feb 2017 02:32:48 +0000 (02:32 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3
am:
2e6bdbeaab
Change-Id: I7e286445a887e467a7de42ce9b27a9dc009e47fd
Suprabh Shukla [Thu, 2 Feb 2017 02:28:13 +0000 (02:28 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8
am:
ab8d3febd3
Change-Id: If42411391fe2010162c51adf48e720e308a650ec
Suprabh Shukla [Thu, 2 Feb 2017 02:21:16 +0000 (02:21 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
4ffe72dcc8
Change-Id: Ic7b9ef6484df0b57c8f1ee7a483ef3bda05c7cc7
Makoto Onuki [Wed, 4 Jan 2017 22:36:59 +0000 (14:36 -0800)]
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.
Test: Manually tested wipeData() with ApiDemos, both on 1) the primary user,
2) a secondary user and 3) work profile.
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug
30681079
Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Merged-in: Ia832bed0f22396998d6307ab46e262dae9463838
(cherry picked from commit
efdec8f5688ce6b0a287eddb6d5dad93ffa0e1ee)
Suprabh Shukla [Tue, 31 Jan 2017 21:01:28 +0000 (13:01 -0800)]
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
Suprabh Shukla [Tue, 31 Jan 2017 02:24:02 +0000 (18:24 -0800)]
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
Merged-In: Ia832bed0f22396998d6307ab46e262dae9463838
Suprabh Shukla [Tue, 31 Jan 2017 04:52:04 +0000 (20:52 -0800)]
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
Suprabh Shukla [Tue, 31 Jan 2017 02:02:18 +0000 (18:02 -0800)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
Bug
30681079
Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Kenny Guy [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +0000)]
Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit
adbda7474cc1968b66e9948aee566dc346e71340)
OSDN Git Service
