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

Remove redundant code in certificate pref controllers

Browse Source 
mPreferenceKey in BasePreferenceController is set via the second
argument of the constructor and has a getter. It doesn't look necessary
to override the getter to return the key. The given one also looks
inconsistent.

Test: atest com.android.settings.security
Bug: 139173976
Bug: 112038744
Change-Id: I6e20b46675308f7dbb8f82f7e372bf94f21e4bed
This commit is contained in:
Victor Hsieh
2019-11-01 09:59:51 -07:00
parent 28fbb6bb63
commit bde026ae67
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/security/InstallCaCertificatePreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.security; package com.android.settings.security;
import android.content.Context; import android.content.Context;
import android.os.UserManager;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
@@ -27,16 +26,11 @@ public class InstallCaCertificatePreferenceController extends
private static final String KEY_INSTALL_CA_CERTIFICATE = "install_ca_certificate"; private static final String KEY_INSTALL_CA_CERTIFICATE = "install_ca_certificate";
public InstallCaCertificatePreferenceController(Context context) { public InstallCaCertificatePreferenceController(Context context) {
super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS); super(context, KEY_INSTALL_CA_CERTIFICATE);
} }
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return AVAILABLE; return AVAILABLE;
} }
@Override
public String getPreferenceKey() {
return KEY_INSTALL_CA_CERTIFICATE;
}
} }

8
src/com/android/settings/security/InstallUserCertificatePreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.security; package com.android.settings.security;
import android.content.Context; import android.content.Context;
import android.os.UserManager;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
@@ -27,16 +26,11 @@ public class InstallUserCertificatePreferenceController extends
private static final String KEY_INSTALL_USER_CERTIFICATE = "install_user_certificate"; private static final String KEY_INSTALL_USER_CERTIFICATE = "install_user_certificate";
public InstallUserCertificatePreferenceController(Context context) { public InstallUserCertificatePreferenceController(Context context) {
super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS); super(context, KEY_INSTALL_USER_CERTIFICATE);
} }
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return AVAILABLE; return AVAILABLE;
} }
@Override
public String getPreferenceKey() {
return KEY_INSTALL_USER_CERTIFICATE;
}
} }

8
src/com/android/settings/security/InstallWifiCertificatePreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.security; package com.android.settings.security;
import android.content.Context; import android.content.Context;
import android.os.UserManager;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
@@ -27,16 +26,11 @@ public class InstallWifiCertificatePreferenceController extends
private static final String KEY_INSTALL_WIFI_CERTIFICATE = "install_wifi_certificate"; private static final String KEY_INSTALL_WIFI_CERTIFICATE = "install_wifi_certificate";
public InstallWifiCertificatePreferenceController(Context context) { public InstallWifiCertificatePreferenceController(Context context) {
super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS); super(context, KEY_INSTALL_WIFI_CERTIFICATE);
} }
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return AVAILABLE; return AVAILABLE;
} }
@Override
public String getPreferenceKey() {
return KEY_INSTALL_WIFI_CERTIFICATE;
}
} }