Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up ex-users in lock settings db" into nyc-dev

Browse Source
This commit is contained in:
Amith Yamasani
2016-06-17 21:55:59 +00:00
committed by Android (Google) Code Review
parent 7ef9f61be6 f11a574027
commit 8cbe1a6309
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -423,6 +423,9 @@ public class LockSettingsService extends ILockSettings.Stub {
if (Intent.ACTION_USER_ADDED.equals(intent.getAction())) { if (Intent.ACTION_USER_ADDED.equals(intent.getAction())) {
// Notify keystore that a new user was added. // Notify keystore that a new user was added.
final int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0); final int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
if (userHandle > UserHandle.USER_SYSTEM) {
removeUser(userHandle, /* unknownUser= */ true);
}
final KeyStore ks = KeyStore.getInstance(); final KeyStore ks = KeyStore.getInstance();
final UserInfo parentInfo = mUserManager.getProfileParent(userHandle); final UserInfo parentInfo = mUserManager.getProfileParent(userHandle);
final int parentHandle = parentInfo != null ? parentInfo.id : -1; final int parentHandle = parentInfo != null ? parentInfo.id : -1;
@@ -433,7 +436,7 @@ public class LockSettingsService extends ILockSettings.Stub {
} else if (Intent.ACTION_USER_REMOVED.equals(intent.getAction())) { } else if (Intent.ACTION_USER_REMOVED.equals(intent.getAction())) {
final int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0); final int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
if (userHandle > 0) { if (userHandle > 0) {
removeUser(userHandle); removeUser(userHandle, /* unknownUser= */ false);
} }
} }
} }
@@ -1465,7 +1468,7 @@ public class LockSettingsService extends ILockSettings.Stub {
return false; return false;
} }
private void removeUser(int userId) { private void removeUser(int userId, boolean unknownUser) {
mStorage.removeUser(userId); mStorage.removeUser(userId);
mStrongAuth.removeUser(userId); mStrongAuth.removeUser(userId);
@@ -1480,7 +1483,7 @@ public class LockSettingsService extends ILockSettings.Stub {
} catch (RemoteException ex) { } catch (RemoteException ex) {
Slog.w(TAG, "unable to clear GK secure user id"); Slog.w(TAG, "unable to clear GK secure user id");
} }
if (mUserManager.getUserInfo(userId).isManagedProfile()) { if (unknownUser || mUserManager.getUserInfo(userId).isManagedProfile()) {
removeKeystoreProfileKey(userId); removeKeystoreProfileKey(userId);
} }
} }