Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev (ff571fee) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/vpn2/VpnSettings.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.os.Bundle;
		import android.os.Handler;
		import android.os.Message;
		import android.os.ServiceManager;
		import android.os.SystemProperties;
		import android.preference.Preference;
		import android.preference.PreferenceGroup;
		import android.security.Credentials;
		@@ -104,6 +105,16 @@ public class VpnSettings extends SettingsPreferenceFragment implements
		inflater.inflate(R.menu.vpn, menu);
		}

		@Override
		public void onPrepareOptionsMenu(Menu menu) {
		super.onPrepareOptionsMenu(menu);

		// Hide lockdown VPN on devices that require IMS authentication
		if (SystemProperties.getBoolean("persist.radio.imsregrequired", false)) {
		menu.findItem(R.id.vpn_lockdown).setVisible(false);
		}
		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		switch (item.getItemId()) {