Suprabh Shukla
2f1b2d82ca
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
2017-02-02 02:48:23 +00:00
Suprabh Shukla
029364c505
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours
...
am: 773f85ec60
2017-02-02 02:43:24 +00:00
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
963cba5b5b
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc
...
am: 01f971dcdc
2017-02-02 01:10:43 +00:00
Makoto Onuki
01f971dcdc
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
...
am: 2317451acc
2017-02-02 01:03:21 +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
Elliot Waite
3366d4beb4
Merge "Fix @links in reference docs." into nyc-mr1-dev
2017-01-26 04:29:46 +00:00
Elliot Waite
54de77470d
Fix @links in reference docs.
...
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
2017-01-25 17:00:55 -08:00
Kenny Guy
ee9f03d1ed
Fix issue with saving admins before finishing loading. am: f98ed6863a
...
am: b275a205af
2017-01-18 17:27:10 +00:00
Kenny Guy
b275a205af
Fix issue with saving admins before finishing loading.
...
am: f98ed6863a
2017-01-18 17:13:31 +00: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
TreeHugger Robot
332762aaf0
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
2017-01-17 22:53:42 +00:00
Andrew Scull
66d66dd50c
Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473
...
am: ea9463f542
2017-01-13 17:09:51 +00:00
Andrew Scull
eb35ad9969
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev
...
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
2017-01-13 15:28:36 +00:00
Andrew Scull
ea9463f542
Merge "Don't save password metrics to disk." into nyc-dev
...
am: 97848fc473
2017-01-13 14:52:26 +00:00
Andrew Scull
ad4aa1ce7d
resolve merge conflicts of e4cefbf4fc to nyc-dr1-dev
...
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
2017-01-13 13:16:09 +00:00
Andrew Scull
97848fc473
Merge "Don't save password metrics to disk." into nyc-dev
2017-01-13 12:18:45 +00:00
Philip P. Moltmann
1f99f81bdc
Do not write if apply() did not change the file.
...
Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
2017-01-12 16:43:30 -08:00
Philip P. Moltmann
d15c4f1da5
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 31d6889f4c
2017-01-12 16:42:59 -08: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
bcc449eeca
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826
...
am: c3b564e266
2017-01-07 02:39:33 +00:00
Dave Friedman
a111e0f7f0
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe
...
am: e0fd4c8a3b
2017-01-07 02:38:45 +00:00
David Friedman
c3b564e266
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
...
am: 101f885826
2017-01-07 02:30:48 +00:00
Dave Friedman
e0fd4c8a3b
Docs: Updates Javadoc documentation. Bug: 32532540
...
am: 2a3ebadcbe
2017-01-07 02:30:45 +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
fb99d1450d
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7
...
am: d7c1e9bcd0
2017-01-04 01:37:00 +00:00
Kevin Hufnagle
d7c1e9bcd0
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50
...
am: c32df53fc7
2017-01-04 01:32:24 +00: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
b7c9651555
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am: dbe9b81ef5
...
am: 2ff9c02bdc
2017-01-04 01:25:12 +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
1c85b504e2
docs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef
...
am: c8ccc66e85
2017-01-04 01:24:23 +00:00
Kevin Hufnagle
2ff9c02bdc
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
...
am: dbe9b81ef5
2017-01-04 01:18:51 +00:00
Kevin Hufnagle
c8ccc66e85
docs: Added note - test subscriptions cannot use reserved IDs
...
am: 98a11580ef
2017-01-04 01:18:47 +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
596e3a9d1a
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
2016-12-29 10:58:44 +00:00
Charles He
b75b025578
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc
...
am: e426dac4e2
2016-12-29 10:57:41 +00:00
Charles He
835c1bcedb
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
2016-12-29 10:56:32 +00:00
Charles He
9bc2d6b446
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f
...
am: dd7837c5ad
2016-12-29 10:55:23 +00:00
Charles He
b07ddf3814
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
2016-12-29 10:44:41 +00:00
Charles He
e426dac4e2
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c
...
am: 3cc7f6acdc
2016-12-29 10:43:40 +00:00
Charles He
c189f23dd4
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
2016-12-29 10:42:32 +00:00
Charles He
dd7837c5ad
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0
...
am: 8bcdab7e6f
2016-12-29 10:41:25 +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
