diff options
| author | Amith Yamasani <yamasani@google.com> | 2016-06-13 12:09:36 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2016-06-15 11:32:16 -0700 |
| commit | d04aaa323c3a788d26f18fc66e0a59b47e525b38 (patch) | |
| tree | e514dff2a79b0c0ed41022bc2c006040ecb0f79d /keystore/java/android/security/GateKeeper.java | |
| parent | d5f7bf8032da639ee0286a6d121503fa2dfc4a4c (diff) | |
More thorough cleansing of expired users
If any /data/system_[c|d]e folders were not erased
when the user was removed (maybe due to a reboot),
make sure they're cleaned up on restart as well
as when the userId is recycled later.
Mark the users' system folders with the correct
serial number for later verification.
AccountManager shouldn't be querying accounts of
partially created/destroyed users.
Change-Id: I4313756b7464f34cd5ce4fb296d61daa50b41fcb
Fixes: 29285673
Diffstat (limited to 'keystore/java/android/security/GateKeeper.java')
| -rw-r--r-- | keystore/java/android/security/GateKeeper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keystore/java/android/security/GateKeeper.java b/keystore/java/android/security/GateKeeper.java index c1df28c387e5..7a2cbd06eb92 100644 --- a/keystore/java/android/security/GateKeeper.java +++ b/keystore/java/android/security/GateKeeper.java @@ -16,6 +16,7 @@ package android.security; +import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; @@ -32,7 +33,7 @@ public abstract class GateKeeper { public static IGateKeeperService getService() { IGateKeeperService service = IGateKeeperService.Stub.asInterface( - ServiceManager.getService("android.service.gatekeeper.IGateKeeperService")); + ServiceManager.getService(Context.GATEKEEPER_SERVICE)); if (service == null) { throw new IllegalStateException("Gatekeeper service not available"); } |