Merge "Remove redundant code in certificate pref controllers" (1d9a7b3f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/security/InstallCaCertificatePreferenceController.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings.security;

		import android.content.Context;
		import android.os.UserManager;

		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";

		public InstallCaCertificatePreferenceController(Context context) {
		super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
		super(context, KEY_INSTALL_CA_CERTIFICATE);
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		}

		@Override
		public String getPreferenceKey() {
		return KEY_INSTALL_CA_CERTIFICATE;
		}
		}

+1 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings.security;

		import android.content.Context;
		import android.os.UserManager;

		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";

		public InstallUserCertificatePreferenceController(Context context) {
		super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
		super(context, KEY_INSTALL_USER_CERTIFICATE);
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		}

		@Override
		public String getPreferenceKey() {
		return KEY_INSTALL_USER_CERTIFICATE;
		}
		}

+1 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings.security;

		import android.content.Context;
		import android.os.UserManager;

		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";

		public InstallWifiCertificatePreferenceController(Context context) {
		super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
		super(context, KEY_INSTALL_WIFI_CERTIFICATE);
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		}

		@Override
		public String getPreferenceKey() {
		return KEY_INSTALL_WIFI_CERTIFICATE;
		}
		}