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

Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef am: 7643891ae7 am: b33b295586

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

Change-Id: I2e5ec07200ea2e2a57f87be40284753fe4ccb2cc
This commit is contained in:
Treehugger Robot
2020-07-22 09:33:09 +00:00
committed by Automerger Merge Worker
parent b0bcaf6fea b33b295586
commit 81d394261d
6 changed files with 0 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/com/android/settings/security/CredentialStoragePreferenceController.java
View File

@@ -1,49 +0,0 @@
/*
* 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;
import androidx.preference.Preference;
import com.android.settings.R;
public class CredentialStoragePreferenceController extends
RestrictedEncryptionPreferenceController {
private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
private final KeyStore mKeyStore;
public CredentialStoragePreferenceController(Context context) {
super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
mKeyStore = KeyStore.getInstance();
}
@Override
public String getPreferenceKey() {
return KEY_CREDENTIAL_STORAGE_TYPE;
}
@Override
public void updateState(Preference preference) {
preference.setSummary(mKeyStore.isHardwareBacked()
? R.string.credential_storage_type_hardware
: R.string.credential_storage_type_software);
}
}

1
src/com/android/settings/security/EncryptionAndCredential.java
View File

@@ -72,7 +72,6 @@ public class EncryptionAndCredential extends DashboardFragment {
controllers.add(new PreferenceCategoryController(context,
"encryption_and_credentials_status_category").setChildren(
Arrays.asList(encryptStatusController)));
controllers.add(new CredentialStoragePreferenceController(context));
controllers.add(new UserCredentialsPreferenceController(context));
controllers.add(new ResetCredentialsPreferenceController(context, lifecycle));
controllers.add(new InstallCertificatePreferenceController(context));