OSDN Git Service
Jeff Sharkey [Fri, 3 Feb 2017 01:22:53 +0000 (01:22 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b61338ecb3
am:
30a4388481
Change-Id: I8b612304980150f522b0424e564f3bedf030c2b9
Suprabh Shukla [Fri, 3 Feb 2017 01:21:35 +0000 (01:21 +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 am:
32c6684a67 -s ours am:
bcc2e70d40 -s ours am:
6b398f72cb -s ours
am:
cda0f97790 -s ours
Change-Id: Icb63044e32d8898cdb5624d38fef4de30b818978
Suprabh Shukla [Fri, 3 Feb 2017 01:20:32 +0000 (01:20 +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 am:
6b1fd0f9cf -s ours am:
56be9656f7 -s ours am:
e3d5ea3a18 -s ours
am:
58d9af0c77 -s ours
Change-Id: I23f74f1c1588800b2dbc4c33ef15ab457951b57d
Suprabh Shukla [Fri, 3 Feb 2017 01:19:09 +0000 (01:19 +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 am:
f1e045b733 am:
dcc633f1f8 am:
67a4d3e428
am:
710a7e40dc
Change-Id: I4959ae33844b003b6c37325c5b572239cf5da47f
Suprabh Shukla [Fri, 3 Feb 2017 01:18:17 +0000 (01:18 +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 am:
ea91d2d0cc am:
73d19fc1a0 am:
5a2e7e2e58
am:
b2cdb4e2dd
Change-Id: I06acb1de8e89688e64b65f694cf29278a4cf7dde
Suprabh Shukla [Fri, 3 Feb 2017 01:17:18 +0000 (01:17 +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 am:
5fce769ecf am:
642912652e am:
a293067f0b
am:
3411150115
Change-Id: Ie622523996134026550caa6af4c5a858aeb04a60
Jeff Sharkey [Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
b61338ecb3
Change-Id: I56e937265e43bc9dd0adbe24167ae52b5bc0b818
Suprabh Shukla [Thu, 2 Feb 2017 23:57:44 +0000 (23:57 +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 am:
32c6684a67 -s ours am:
bcc2e70d40 -s ours
am:
6b398f72cb -s ours
Change-Id: Idbbf54525fa0b14db3ff710e3e50958c8e80a515
Suprabh Shukla [Thu, 2 Feb 2017 23:53:23 +0000 (23:53 +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 am:
32c6684a67 -s ours
am:
bcc2e70d40 -s ours
Change-Id: I9fd4eab1c0c4728965678e47cffe1c5bfa0b3638
Suprabh Shukla [Thu, 2 Feb 2017 23:49:45 +0000 (23:49 +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 am:
6b1fd0f9cf -s ours am:
56be9656f7 -s ours
am:
e3d5ea3a18 -s ours
Change-Id: Ia68ce30d01f44d47f5edd1c7200912179f84efaf
Suprabh Shukla [Thu, 2 Feb 2017 23:48:18 +0000 (23:48 +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
am:
32c6684a67 -s ours
Change-Id: I0db97d059b78d12aba30255cfc357f51018d5548
Suprabh Shukla [Thu, 2 Feb 2017 23:45:40 +0000 (23:45 +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 am:
6b1fd0f9cf -s ours
am:
56be9656f7 -s ours
Change-Id: I017e9d54ab618f9955787cfa4374868b94b3d8d7
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:41:18 +0000 (23:41 +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
am:
6b1fd0f9cf -s ours
Change-Id: Ia8301b1e589f87a4cb428cd7644ee6b5944f54a5
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
Jack Yu [Thu, 2 Feb 2017 23:32:36 +0000 (15:32 -0800)]
resolve merge conflicts of
e06c03d8437f to nyc-mr1-dev-plus-aosp
Test: Manual test
Change-Id: I13f288c5056b672eec00f850f9d2ee6db73b7a44
Suprabh Shukla [Thu, 2 Feb 2017 23:31:51 +0000 (23:31 +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 am:
f1e045b733 am:
dcc633f1f8
am:
67a4d3e428
Change-Id: I5f41628b921b53ba4cd5588404fe28c4b77b29ea
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:26:21 +0000 (23:26 +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 am:
f1e045b733
am:
dcc633f1f8
Change-Id: I0249dfa725ca30353d557396b3ffe1b1f5169dad
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:19:12 +0000 (23:19 +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
am:
f1e045b733
Change-Id: I6cfa97f2f4fd113cafcca5440eafd6c5bf70698b
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:32 +0000 (23:12 +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 am:
ea91d2d0cc am:
73d19fc1a0
am:
5a2e7e2e58
Change-Id: I336ce9f979c74df32ea80cd43253485ce184d0c0
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:11:34 +0000 (23:11 +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 am:
5fce769ecf am:
642912652e
am:
a293067f0b
Change-Id: Idf95cea3331afbab3f6c69ced3341a7fa1dac2e1
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:06:08 +0000 (23:06 +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 am:
ea91d2d0cc
am:
73d19fc1a0
Change-Id: I3d09ae3d8683f9f4a2c68321eb4fdd9490c9355b
Suprabh Shukla [Thu, 2 Feb 2017 23:05:10 +0000 (23:05 +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 am:
5fce769ecf
am:
642912652e
Change-Id: Ie6d665f3cb2aae6e8043b4bde28005a2aaa94953
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
Jack Yu [Thu, 2 Feb 2017 23:03:17 +0000 (23:03 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564 am:
40d0753b10 am:
413922e746 am:
426f454b69 am:
fab95f8ad6 am:
37d3b12aa1 am:
73056d5feb am:
ecadb9d7cb
am:
f565a487bb
Change-Id: Ia8861b784be1b25dae59cea5b2eb288ec739e346
Suprabh Shukla [Thu, 2 Feb 2017 23:01:14 +0000 (23:01 +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
am:
ea91d2d0cc
Change-Id: I4f5ae380b111b21838744c83eda1e3772d705692
Suprabh Shukla [Thu, 2 Feb 2017 23:00:10 +0000 (23:00 +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
am:
5fce769ecf
Change-Id: I903e7a49df102aaa442cfb49040cd99bb2e7f0f2
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
Jack Yu [Thu, 2 Feb 2017 22:55:10 +0000 (22:55 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564 am:
40d0753b10 am:
413922e746 am:
426f454b69 am:
fab95f8ad6 am:
37d3b12aa1 am:
73056d5feb
am:
ecadb9d7cb
Change-Id: I85221b6dc0097893ec6d5d3fbbe09d549ecc1b18
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
Jack Yu [Thu, 2 Feb 2017 22:51:09 +0000 (22:51 +0000)]
Fixed the logic for tethering provisioning re-evaluation am:
91a0bc9564 am:
40d0753b10 am:
413922e746 am:
426f454b69 am:
fab95f8ad6 am:
37d3b12aa1
am:
73056d5feb
Change-Id: Id542f20e2e11baae9b6281af86d8f0dbe12d08b3
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
Peter Qiu [Thu, 2 Feb 2017 19:42:51 +0000 (19:42 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am:
e724f82b3d
am:
281fae21f8
Change-Id: I1baeb7afdff6fbc399ab16ef7aa266506ef7aacb
Peter Qiu [Thu, 2 Feb 2017 19:37:50 +0000 (19:37 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
am:
e724f82b3d
Change-Id: I250566dbd8dff8c50692e47b1b3e9bb7568bb8b4
Treehugger Robot [Thu, 2 Feb 2017 19:29:51 +0000 (19:29 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
Paul Lawrence [Thu, 2 Feb 2017 18:31:42 +0000 (18:31 +0000)]
Merge "Install seccomp into zygote not init" am:
ba9bbd8517
am:
dcf63748fc
Change-Id: I7cb6ff86a8466aa0ca45691b2d169b4b7467bd9a
Paul Lawrence [Thu, 2 Feb 2017 18:30:49 +0000 (18:30 +0000)]
Install seccomp into zygote not init am:
ef85477470
am:
521d25294b
Change-Id: I7c2c84a5bd67490070777d11d7f930c5dba90cbe
Alex Deymo [Thu, 2 Feb 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Compile native network functionis into libandroid_net." am:
b1cb60d920
am:
5292c727b7
Change-Id: I81f4a2ecf25fe324afa78b5dfb9fd4f7d264e1c6
Alex Deymo [Thu, 2 Feb 2017 18:23:21 +0000 (18:23 +0000)]
Compile native network functionis into libandroid_net. am:
f3b7411060
am:
af657d14fc
Change-Id: Ic8e457c36a35afd296ae97704e0703dbae781d40
Paul Lawrence [Thu, 2 Feb 2017 18:18:15 +0000 (18:18 +0000)]
Merge "Install seccomp into zygote not init"
am:
ba9bbd8517
Change-Id: I989c34f133e37b68dbd387b263dc5191ac8d6215
Paul Lawrence [Thu, 2 Feb 2017 18:18:08 +0000 (18:18 +0000)]
Install seccomp into zygote not init
am:
ef85477470
Change-Id: I22745a759cc4f9797cb3c806bbdd4d69d6cccdcb
Alex Deymo [Thu, 2 Feb 2017 18:16:45 +0000 (18:16 +0000)]
Merge "Compile native network functionis into libandroid_net."
am:
b1cb60d920
Change-Id: Ia0cf31b962cd26b9c7d1d4917b3523e7f3fbfa2c
Alex Deymo [Thu, 2 Feb 2017 18:11:40 +0000 (18:11 +0000)]
Compile native network functionis into libandroid_net.
am:
f3b7411060
Change-Id: Ib01eaf11caacb35ba905012f06d0777d237dd2d1
Paul Lawrence [Thu, 2 Feb 2017 18:09:17 +0000 (18:09 +0000)]
Merge "Install seccomp into zygote not init"
Treehugger Robot [Thu, 2 Feb 2017 17:59:52 +0000 (17:59 +0000)]
Merge "Compile native network functionis into libandroid_net."
Paul Lawrence [Tue, 31 Jan 2017 17:54:31 +0000 (09:54 -0800)]
Install seccomp into zygote not init
Bug:
34710876
Test: Boots, correct size filter installed, blocks unallowed calls
Change-Id: I3e66e8724ace37f7d30451b98a5e574766252ea0
Erik Kline [Thu, 2 Feb 2017 07:27:13 +0000 (07:27 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am:
c313123afe
am:
6f32aa0259
Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
Erik Kline [Thu, 2 Feb 2017 07:22:05 +0000 (07:22 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()"
am:
c313123afe
Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477
Treehugger Robot [Thu, 2 Feb 2017 07:15:03 +0000 (07:15 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()"
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
Hugo Benichi [Thu, 2 Feb 2017 06:47:35 +0000 (06:47 +0000)]
Merge "Define Network notification proto constants." am:
05550d9ed8
am:
6236f49f0e
Change-Id: Ibb7620ea6946c2649d053859a2a1b55fbb78ed12
Hugo Benichi [Thu, 2 Feb 2017 06:42:32 +0000 (06:42 +0000)]
Merge "Define Network notification proto constants."
am:
05550d9ed8
Change-Id: I3a169ace694ed42c59f3d818f007b638fdf4969f
Hugo Benichi [Thu, 2 Feb 2017 06:36:21 +0000 (06:36 +0000)]
Merge "Define Network notification proto constants."
Erik Kline [Thu, 2 Feb 2017 05:20:05 +0000 (05:20 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am:
603eefd5d5
am:
180a3d07a8
Change-Id: I9f80a3ff713b4b00136808051a717509f600bb9a
Erik Kline [Thu, 2 Feb 2017 05:15:23 +0000 (05:15 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
am:
603eefd5d5
Change-Id: I6b2a0d6df70df028ef9b8ff5d689c5a627d8daf8
Treehugger Robot [Thu, 2 Feb 2017 05:07:22 +0000 (05:07 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
Suprabh Shukla [Thu, 2 Feb 2017 02:57:58 +0000 (02:57 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60 am:
029364c505 am:
2f1b2d82ca
am:
ac8f44e387
Change-Id: I7e4376740ddf167035a3274c19ca5ae3f113a9b0
Suprabh Shukla [Thu, 2 Feb 2017 02:53:21 +0000 (02:53 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60 am:
029364c505
am:
2f1b2d82ca
Change-Id: I8094afc5c919b65d7f180ef9d3ad875f3ea4dacf
Suprabh Shukla [Thu, 2 Feb 2017 02:48:23 +0000 (02:48 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60
am:
029364c505
Change-Id: Ibef494c57a80a7b0d871dd8a80f877816e6897d0
Suprabh Shukla [Thu, 2 Feb 2017 02:43:24 +0000 (02:43 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours
am:
773f85ec60
Change-Id: Ie83cb2dfd89fd808e906a802e16fd1943a898012
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
OSDN Git Service
