Merge "[Settings] Reduce CDMA API access when not required" (599a3b11) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java

+29 −19

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.settings.network.telephony.TelephonyConstants.Telephon
		import android.content.Context;
		import android.provider.Settings;
		import android.telephony.TelephonyManager;
		import android.util.Log;

		import androidx.preference.ListPreference;
		import androidx.preference.Preference;
		@@ -34,6 +35,7 @@ import com.android.settings.network.telephony.MobileNetworkUtils;
		*/
		public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceController
		implements ListPreference.OnPreferenceChangeListener {
		private static final String TAG = "CdmaSystemSelectPreferenceController";

		public CdmaSystemSelectPreferenceController(Context context, String key) {
		super(context, key);
		@@ -43,8 +45,13 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
		public void updateState(Preference preference) {
		super.updateState(preference);
		final ListPreference listPreference = (ListPreference) preference;
		listPreference.setVisible(getAvailabilityStatus() == AVAILABLE);
		boolean isVisible = (getAvailabilityStatus() == AVAILABLE);
		listPreference.setVisible(isVisible);
		if (!isVisible) {
		return;
		}
		boolean hasTelephonyMgr = mTelephonyManager != null;
		try {
		final int mode =
		hasTelephonyMgr ? mTelephonyManager.getCdmaRoamingMode()
		: TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT;
		@@ -65,6 +72,9 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
		final boolean enableList = settingsNetworkMode != NETWORK_MODE_LTE_GSM_WCDMA
		&& settingsNetworkMode != NETWORK_MODE_NR_LTE_GSM_WCDMA;
		listPreference.setEnabled(enableList);
		} catch (Exception exception) {
		Log.e(TAG, "Fail to access framework API", exception);
		}
		}

		@Override