Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev

2015-06-25 15:43:11 +00:00
parent c781405f43 070fe63962
commit f1900b500f
1 changed files with 9 additions and 0 deletions
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -700,6 +700,15 @@ public class LockSettingsService extends ILockSettings.Stub {

        final KeyStore ks = KeyStore.getInstance();
        ks.onUserRemoved(userId);
+
+        try {
+            final IGateKeeperService gk = getGateKeeperService();
+            if (gk != null) {
+                    gk.clearSecureUserId(userId);
+            }
+        } catch (RemoteException ex) {
+            Slog.w(TAG, "unable to clear GK secure user id");
+        }
    }

    private static final String[] VALID_SETTINGS = new String[] {