Suprabh Shukla
773f85ec60
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab
...
am: 588411fc7c
2017-02-02 02:38:24 +00:00
Suprabh Shukla
588411fc7c
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3
...
am: 2e6bdbeaab
2017-02-02 02:32:48 +00:00
Suprabh Shukla
2e6bdbeaab
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8
...
am: ab8d3febd3
2017-02-02 02:28:13 +00:00
Suprabh Shukla
ab8d3febd3
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
...
am: 4ffe72dcc8
2017-02-02 02:21:16 +00:00
Makoto Onuki
2317451acc
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 efdec8f568
2017-01-31 21:21:36 +00:00
Suprabh Shukla
4ffe72dcc8
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
...
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.
Bug 30681079
Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
2017-01-31 13:01:36 -08:00
Kenny Guy
f98ed6863a
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 adbda7474c
2017-01-18 12:01:55 +00:00
Andrew Scull
97848fc473
Merge "Don't save password metrics to disk." into nyc-dev
2017-01-13 12:18:45 +00:00
Andrew Scull
e4cefbf4fc
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: 5daf273b7e
2017-01-12 16:01:59 +00:00
David Friedman
101f885826
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
2017-01-07 02:24:57 +00:00
Dave Friedman
2a3ebadcbe
Docs: Updates Javadoc documentation.
...
Bug: 32532540
Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
2017-01-06 16:41:19 -08:00
Kevin Hufnagle
c32df53fc7
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38
...
am: 4418907d50
2017-01-04 01:28:19 +00:00
Kevin Hufnagle
4418907d50
docs: Added descriptions of IAB subscription-specific settings.
...
am: 145b377b38
2017-01-04 01:24:24 +00:00
Kevin Hufnagle
dbe9b81ef5
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
2017-01-04 01:14:23 +00:00
Charles He
0e2e913b04
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb
...
am: 1d84f619bf
2016-12-29 10:37:45 +00:00
Charles He
3cc7f6acdc
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089
...
am: ced5ab190c
2016-12-29 10:36:32 +00:00
Charles He
03fa83e216
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
2016-12-29 10:35:19 +00:00
Charles He
8bcdab7e6f
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9
...
am: 9a47fa7fc0
2016-12-29 10:34:04 +00:00
Charles He
1d84f619bf
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b
...
am: 5c74a1e9bb
2016-12-29 10:28:57 +00:00
Charles He
ced5ab190c
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8
...
am: 0cc0219089
2016-12-29 10:27:52 +00:00
Charles He
6bb6f02a15
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd
...
am: e15e0de7e5
2016-12-29 10:26:51 +00:00
Charles He
9a47fa7fc0
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882
...
am: e5156ec1e9
2016-12-29 10:25:50 +00:00
Charles He
5c74a1e9bb
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad
...
am: f027831c6b
2016-12-29 10:21:47 +00:00
Charles He
0cc0219089
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2
...
am: 76ca2da7e8
2016-12-29 10:20:47 +00:00
Charles He
e15e0de7e5
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7
...
am: b64af9bacd
2016-12-29 10:19:49 +00:00
Charles He
e5156ec1e9
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611
...
am: 00a581f882
2016-12-29 10:18:49 +00:00
Charles He
f027831c6b
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d
...
am: a1d59972ad
2016-12-29 10:14:26 +00:00
Charles He
76ca2da7e8
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f
...
am: 6aa436bef2
2016-12-29 10:13:27 +00:00
Charles He
b64af9bacd
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92
...
am: d7f2a4b0c7
2016-12-29 10:12:24 +00:00
Charles He
00a581f882
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d
...
am: 133ff4d611
2016-12-29 10:11:20 +00:00
Charles He
a1d59972ad
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b
...
am: 1422a6074d
2016-12-29 10:07:20 +00:00
Charles He
6aa436bef2
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9
...
am: d0339c6e8f
2016-12-29 10:06:14 +00:00
Charles He
d7f2a4b0c7
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888
...
am: a8484b4f92
2016-12-29 10:05:02 +00:00
Charles He
133ff4d611
Prevent writing to FRP partition during factory reset. am: a9437bd1ca
...
am: 2ce5c4320d
2016-12-29 10:03:53 +00:00
Charles He
1422a6074d
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
...
am: 63a27d773b
2016-12-29 09:50:26 +00:00
Charles He
d0339c6e8f
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
...
am: 71d2a41dd9
2016-12-29 09:50:20 +00:00
Charles He
a8484b4f92
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
...
am: 4bd97eb888
2016-12-29 09:48:50 +00:00
Charles He
2ce5c4320d
Prevent writing to FRP partition during factory reset.
...
am: a9437bd1ca
2016-12-29 09:48:45 +00:00
Charles He
63a27d773b
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
2016-12-29 09:43:14 +00:00
Charles He
4bd97eb888
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
2016-12-29 09:42:30 +00:00
Tom O'Neill
7cec76de0f
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51
...
am: 56098f81b6
2016-12-22 17:44:46 +00:00
Tom O'Neill
56098f81b6
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc
...
am: 1ac8affd51
2016-12-22 17:39:18 +00:00
Tom O'Neill
1ac8affd51
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66
...
am: d82f8a67fc
2016-12-22 17:34:11 +00:00
Tom O'Neill
d82f8a67fc
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2
...
am: 1f458fdc66
2016-12-22 17:29:05 +00:00
Tom O'Neill
1f458fdc66
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344
...
am: d28eef0cc2
2016-12-22 17:23:39 +00:00
Tom O'Neill
d28eef0cc2
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b
...
am: 1684e5f344
2016-12-22 17:19:10 +00:00
Tom O'Neill
1684e5f344
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516
...
am: 0a8978f04b
2016-12-22 17:14:05 +00:00
Tom O'Neill
0a8978f04b
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872
...
am: 3380a77516
2016-12-22 17:09:09 +00:00
Tom O'Neill
3380a77516
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e
...
am: d417e54872
2016-12-22 17:04:07 +00:00
Tom O'Neill
d417e54872
Fix exploit where can hide the fact that a location was mocked
...
am: a206a0f17e
2016-12-22 16:58:33 +00:00
