OSDN Git Service
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: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: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: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: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
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: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
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
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 [Thu, 2 Feb 2017 01:10:43 +0000 (01:10 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc
am:
01f971dcdc
Change-Id: If5f5e5d47b97e2b8480adc5ca2cb08702056ca87
Makoto Onuki [Thu, 2 Feb 2017 01:03:21 +0000 (01:03 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
2317451acc
Change-Id: Id3441141d4feea4c7291350c9670bd59ec017240
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 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
Elliot Waite [Thu, 26 Jan 2017 04:29:43 +0000 (04:29 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev
Elliot Waite [Wed, 11 Jan 2017 23:30:35 +0000 (15:30 -0800)]
Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
Kenny Guy [Wed, 18 Jan 2017 17:27:10 +0000 (17:27 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a
am:
b275a205af
Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
Kenny Guy [Wed, 18 Jan 2017 17:13:31 +0000 (17:13 +0000)]
Fix issue with saving admins before finishing loading.
am:
f98ed6863a
Change-Id: I7f816c164548df86f9607c86772902efd0d53620
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)
TreeHugger Robot [Tue, 17 Jan 2017 22:53:38 +0000 (22:53 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
Jack Yu [Mon, 16 Jan 2017 18:49:55 +0000 (10:49 -0800)]
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
Andrew Scull [Fri, 13 Jan 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473
am:
ea9463f542
Change-Id: I76b21c0ea4ab7394281ee8c82ed67179eb9ea966
Andrew Scull [Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
Andrew Scull [Fri, 13 Jan 2017 14:52:26 +0000 (14:52 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
am:
97848fc473
Change-Id: I12d9a6d18654673e5912416550c64e81aab857f9
Andrew Scull [Fri, 13 Jan 2017 13:16:09 +0000 (13:16 +0000)]
resolve merge conflicts of
e4cefbf4fce4 to nyc-dr1-dev
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
Andrew Scull [Fri, 13 Jan 2017 12:18:42 +0000 (12:18 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
Philip P. Moltmann [Wed, 14 Dec 2016 00:32:06 +0000 (16:32 -0800)]
Do not write if apply() did not change the file.
Bug:
33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
Philip P. Moltmann [Wed, 14 Dec 2016 00:23:21 +0000 (16:23 -0800)]
Only persist last Shared Preferences state
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.
For commit() we need to make sure that we have at least persisted the
state of the commit.
Generation counts are 64 bit, hence they never overflow.
Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug:
33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit
31d6889f4c89dd8498e2095f9d8a3c39fbd17c86)
Andrew Scull [Fri, 2 Dec 2016 16:08:09 +0000 (16:08 +0000)]
Don't save password metrics to disk.
On FBE devices, don't save the metrics to disk but compute them when the
password is first entered and only store them in RAM.
Merged-in:
5daf273b7e3272269c53eda20ce494d0e7a365b5
Bug:
32793550
Change-Id: Icee7f615167761177b224b342970a36c7d90f6ba
David Friedman [Sat, 7 Jan 2017 02:39:33 +0000 (02:39 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826
am:
c3b564e266
Change-Id: I23fdc92b08e32c643de8009bebf4e02c41741c7e
Dave Friedman [Sat, 7 Jan 2017 02:38:45 +0000 (02:38 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe
am:
e0fd4c8a3b
Change-Id: I8f65ad71433efbe1121e0617c6d7575b7db3a051
David Friedman [Sat, 7 Jan 2017 02:30:48 +0000 (02:30 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev
am:
101f885826
Change-Id: I5e6d948373c8f8ff2892c843329a7d2b540b8706
Dave Friedman [Sat, 7 Jan 2017 02:30:45 +0000 (02:30 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540
am:
2a3ebadcbe
Change-Id: Ibee55c5e73d9b51e5f5df24be01b0b797fa8a7a5
David Friedman [Sat, 7 Jan 2017 02:24:54 +0000 (02:24 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev
Dave Friedman [Thu, 5 Jan 2017 02:27:26 +0000 (18:27 -0800)]
Docs: Updates Javadoc documentation.
Bug:
32532540
Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
Kevin Hufnagle [Wed, 4 Jan 2017 01:37:00 +0000 (01:37 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7
am:
d7c1e9bcd0
Change-Id: I7f9ce1b661f8defca2918eece234a9c26d5f08a3
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:24 +0000 (01:32 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50
am:
c32df53fc7
Change-Id: Ib2ac681a13b8d3b80feba803f25fdc8dbdcfe4f9
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:19 +0000 (01:28 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38
am:
4418907d50
Change-Id: I486f53410a427f373daec719bac522289d812e7a
Kevin Hufnagle [Wed, 4 Jan 2017 01:25:12 +0000 (01:25 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5
am:
2ff9c02bdc
Change-Id: I930313b754635e07b190793c3b79de39b71b6b8a
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:24 +0000 (01:24 +0000)]
docs: Added descriptions of IAB subscription-specific settings.
am:
145b377b38
Change-Id: I1b7a0885f613beb9b7baba8a6b35b59f00989ff3
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:23 +0000 (01:24 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef
am:
c8ccc66e85
Change-Id: Id17c38ec7f6b85bcbfaaf676bf3a2f1414fca893
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:51 +0000 (01:18 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
am:
dbe9b81ef5
Change-Id: Ie08ac386f441b16451538e21dcc8d5e5052258b0
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:47 +0000 (01:18 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs
am:
98a11580ef
Change-Id: I2c44d24b772d3df80dabab418875a1e9842aebbf
Kevin Hufnagle [Wed, 4 Jan 2017 01:14:21 +0000 (01:14 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
Charles He [Thu, 29 Dec 2016 10:58:44 +0000 (10:58 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb am:
1d84f619bf am:
0e2e913b04
am:
b07ddf3814
Change-Id: I5fc69e1d8e02e405ae9ca8362a5c1f6312b4f53e
Charles He [Thu, 29 Dec 2016 10:57:41 +0000 (10:57 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c am:
3cc7f6acdc
am:
e426dac4e2
Change-Id: I6451344efe089a7ff5de2082a9b8b77661c49ab7
Charles He [Thu, 29 Dec 2016 10:56:32 +0000 (10:56 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15 am:
03fa83e216
am:
c189f23dd4
Change-Id: I8426e0788ce1dcb12daac23e82663284633cae5b
Charles He [Thu, 29 Dec 2016 10:55:23 +0000 (10:55 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0 am:
8bcdab7e6f
am:
dd7837c5ad
Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
Charles He [Thu, 29 Dec 2016 10:44:41 +0000 (10:44 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb am:
1d84f619bf
am:
0e2e913b04
Change-Id: I02047ef2536a6a77df84e1b203d3b5ee55439e32
Charles He [Thu, 29 Dec 2016 10:43:40 +0000 (10:43 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089 am:
ced5ab190c
am:
3cc7f6acdc
Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d
Charles He [Thu, 29 Dec 2016 10:42:32 +0000 (10:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5 am:
6bb6f02a15
am:
03fa83e216
Change-Id: I8f10fcf6b604848f68ecc086dd3723841e07ef8c
Charles He [Thu, 29 Dec 2016 10:41:25 +0000 (10:41 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9 am:
9a47fa7fc0
am:
8bcdab7e6f
Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a
Charles He [Thu, 29 Dec 2016 10:37:45 +0000 (10:37 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b am:
5c74a1e9bb
am:
1d84f619bf
Change-Id: Ic189edc98c3079ca98b258d08a5821b9c97dc027
Charles He [Thu, 29 Dec 2016 10:36:32 +0000 (10:36 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8 am:
0cc0219089
am:
ced5ab190c
Change-Id: I59602f83fd659ce5192636d0e66feae217997d7c
Charles He [Thu, 29 Dec 2016 10:35:19 +0000 (10:35 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd am:
e15e0de7e5
am:
6bb6f02a15
Change-Id: I849811a3be2c6989edea3ed6f938b4b36a4fabe7
Charles He [Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882 am:
e5156ec1e9
am:
9a47fa7fc0
Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
Charles He [Thu, 29 Dec 2016 10:28:57 +0000 (10:28 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad am:
f027831c6b
am:
5c74a1e9bb
Change-Id: Ie15d3c1927f17a36ed6d6bbe4b96c986536be3c7
Charles He [Thu, 29 Dec 2016 10:27:52 +0000 (10:27 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2 am:
76ca2da7e8
am:
0cc0219089
Change-Id: Id72d64d9356e362f35062bc6e45071b2be308558
Charles He [Thu, 29 Dec 2016 10:26:51 +0000 (10:26 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7 am:
b64af9bacd
am:
e15e0de7e5
Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3
Charles He [Thu, 29 Dec 2016 10:25:50 +0000 (10:25 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611 am:
00a581f882
am:
e5156ec1e9
Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
Charles He [Thu, 29 Dec 2016 10:21:47 +0000 (10:21 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d am:
a1d59972ad
am:
f027831c6b
Change-Id: I49d10d41d5b89c97a2f418ccaed44eeae720bb22
Charles He [Thu, 29 Dec 2016 10:20:47 +0000 (10:20 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am:
71d2a41dd9 am:
d0339c6e8f am:
6aa436bef2
am:
76ca2da7e8
Change-Id: I9e20b2954ccb462cee31cb5ea44986c00afadbff
Charles He [Thu, 29 Dec 2016 10:19:49 +0000 (10:19 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am:
4bd97eb888 am:
a8484b4f92 am:
d7f2a4b0c7
am:
b64af9bacd
Change-Id: I261c46544e8e1aef26772d57475037810198e4d9
Charles He [Thu, 29 Dec 2016 10:18:49 +0000 (10:18 +0000)]
Prevent writing to FRP partition during factory reset. am:
a9437bd1ca am:
2ce5c4320d am:
133ff4d611
am:
00a581f882
Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
Charles He [Thu, 29 Dec 2016 10:14:26 +0000 (10:14 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am:
63a27d773b am:
1422a6074d
am:
a1d59972ad
Change-Id: I027ab6594b563204515677fca9c256251b7067cd