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

* commit 'f1900b500f71c372376b5d951d581afcca8d7b57':
  [LockSettings] clear secure user id when user is removed
This commit is contained in:
Andres Morales
2015-06-25 15:52:35 +00:00
committed by Android Git Automerger

View File

@@ -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[] {