This patch updates the ResetCredentialsPreferenceController to check the WIFI keystore namespace if called by the primary user. Test: Install a WIFI certificate or key and watch the "Clear credentials" button become enabled in the credential storage dialog of Settings. Bug: 189601008 Change-Id: I69828b64a7e3c707c27b4582d64ff0ddb863a4ff
97 lines
3.2 KiB
Java
97 lines
3.2 KiB
Java
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.security;
|
|
|
|
import android.content.Context;
|
|
import android.os.UserManager;
|
|
import android.security.keystore.KeyProperties;
|
|
import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
|
|
|
|
import androidx.preference.PreferenceScreen;
|
|
|
|
import com.android.settingslib.RestrictedPreference;
|
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
|
import com.android.settingslib.core.lifecycle.events.OnResume;
|
|
|
|
import java.security.KeyStore;
|
|
import java.security.KeyStoreException;
|
|
|
|
public class ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController
|
|
implements LifecycleObserver, OnResume {
|
|
|
|
private static final String KEY_RESET_CREDENTIALS = "credentials_reset";
|
|
|
|
private final KeyStore mKeyStore;
|
|
private final KeyStore mWifiKeyStore;
|
|
|
|
private RestrictedPreference mPreference;
|
|
|
|
public ResetCredentialsPreferenceController(Context context, Lifecycle lifecycle) {
|
|
super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
|
|
KeyStore keyStore = null;
|
|
try {
|
|
keyStore = KeyStore.getInstance("AndroidKeyStore");
|
|
keyStore.load(null);
|
|
} catch (Exception e) {
|
|
keyStore = null;
|
|
}
|
|
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) {
|
|
lifecycle.addObserver(this);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public String getPreferenceKey() {
|
|
return KEY_RESET_CREDENTIALS;
|
|
}
|
|
|
|
@Override
|
|
public void displayPreference(PreferenceScreen screen) {
|
|
super.displayPreference(screen);
|
|
mPreference = screen.findPreference(getPreferenceKey());
|
|
}
|
|
|
|
@Override
|
|
public void onResume() {
|
|
if (mPreference != null && !mPreference.isDisabledByAdmin()) {
|
|
boolean isEnabled = false;
|
|
try {
|
|
isEnabled = (mKeyStore != null
|
|
&& mKeyStore.aliases().hasMoreElements())
|
|
|| (mWifiKeyStore != null
|
|
&& mWifiKeyStore.aliases().hasMoreElements());
|
|
|
|
} catch (KeyStoreException e) {
|
|
// If access to keystore fails, treat as disabled.
|
|
}
|
|
mPreference.setEnabled(isEnabled);
|
|
}
|
|
}
|
|
}
|