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

Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994

Change-Id: I7a48bd13efccbb49ebd57ee298b7b71dd5410060
This commit is contained in:
Treehugger Robot
2021-06-03 10:10:25 +00:00
committed by Automerger Merge Worker
parent 38f9e01f84 5f1034bce0
commit 2b98c25bcf
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/security/ResetCredentialsPreferenceController.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.security;
import android.content.Context; import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
import android.security.keystore.KeyProperties;
import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -35,6 +37,7 @@ public class ResetCredentialsPreferenceController extends RestrictedEncryptionPr
private static final String KEY_RESET_CREDENTIALS = "credentials_reset"; private static final String KEY_RESET_CREDENTIALS = "credentials_reset";
private final KeyStore mKeyStore; private final KeyStore mKeyStore;
private final KeyStore mWifiKeyStore;
private RestrictedPreference mPreference; private RestrictedPreference mPreference;
@@ -45,8 +48,19 @@ public class ResetCredentialsPreferenceController extends RestrictedEncryptionPr
keyStore = KeyStore.getInstance("AndroidKeyStore"); keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null); keyStore.load(null);
} catch (Exception e) { } catch (Exception e) {
keyStore = null;
} }
mKeyStore = keyStore; mKeyStore = keyStore;
keyStore = null;
if (context.getUser().isSystem()) {
try {
keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(new AndroidKeyStoreLoadStoreParameter(KeyProperties.NAMESPACE_WIFI));
} catch (Exception e) {
keyStore = null;
}
}
mWifiKeyStore = keyStore;
if (lifecycle != null) { if (lifecycle != null) {
lifecycle.addObserver(this); lifecycle.addObserver(this);
} }
@@ -68,9 +82,11 @@ public class ResetCredentialsPreferenceController extends RestrictedEncryptionPr
if (mPreference != null && !mPreference.isDisabledByAdmin()) { if (mPreference != null && !mPreference.isDisabledByAdmin()) {
boolean isEnabled = false; boolean isEnabled = false;
try { try {
if (mKeyStore != null) { isEnabled = (mKeyStore != null
isEnabled = mKeyStore.aliases().hasMoreElements(); && mKeyStore.aliases().hasMoreElements())
} || (mWifiKeyStore != null
&& mWifiKeyStore.aliases().hasMoreElements());
} catch (KeyStoreException e) { } catch (KeyStoreException e) {
// If access to keystore fails, treat as disabled. // If access to keystore fails, treat as disabled.
} }