PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev

Browse Source 
* commit '227ba29e3947c8d53cb4a8138f0c3f209ae414e3':
  Clear only keystore credential entires
This commit is contained in:
Chad Brubaker
2015-05-27 20:23:44 +00:00
committed by Android Git Automerger
parent 6042133f48 227ba29e39
commit 08ffcb996e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/CredentialStorage.java
View File

@@ -104,6 +104,12 @@ public final class CredentialStorage extends Activity {
private final KeyStore mKeyStore = KeyStore.getInstance(); private final KeyStore mKeyStore = KeyStore.getInstance();
/**
* The UIDs that are used for system credential storage in keystore.
*/
private static final int[] SYSTEM_CREDENTIAL_UIDS = {Process.WIFI_UID, Process.VPN_UID,
Process.ROOT_UID, Process.SYSTEM_UID};
/** /**
* When non-null, the bundle containing credentials to install. * When non-null, the bundle containing credentials to install.
*/ */
@@ -333,7 +339,14 @@ public final class CredentialStorage extends Activity {
@Override protected Boolean doInBackground(Void... unused) { @Override protected Boolean doInBackground(Void... unused) {
mKeyStore.reset(); // Clear all the users credentials could have been installed in for this user.
final UserManager um = (UserManager) getSystemService(USER_SERVICE);
for (UserInfo pi : um.getProfiles(UserHandle.getUserId(Process.myUid()))) {
for (int uid : SYSTEM_CREDENTIAL_UIDS) {
mKeyStore.clearUid(UserHandle.getUid(pi.id, uid));
}
}
try { try {
KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this); KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);