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

Merge "[Settings] Reduce CDMA API access when not required" into tm-qpr-dev am: 147669c893

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

Change-Id: Iac1f7f8b5de6d6a50591170637c62f379fa6c1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bonian Chen
2023-01-19 03:55:55 +00:00
committed by Automerger Merge Worker
parent 392d971067 147669c893
commit b079eb6287
1 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
View File

@@ -18,10 +18,12 @@ package com.android.settings.network.telephony.cdma;
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA; import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA; import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.Log;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -33,6 +35,7 @@ import com.android.settings.network.telephony.MobileNetworkUtils;
*/ */
public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceController public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceController
implements ListPreference.OnPreferenceChangeListener { implements ListPreference.OnPreferenceChangeListener {
private static final String TAG = "CdmaSystemSelectPreferenceController";
public CdmaSystemSelectPreferenceController(Context context, String key) { public CdmaSystemSelectPreferenceController(Context context, String key) {
super(context, key); super(context, key);
@@ -42,23 +45,36 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
final ListPreference listPreference = (ListPreference) preference; final ListPreference listPreference = (ListPreference) preference;
listPreference.setVisible(getAvailabilityStatus() == AVAILABLE); boolean isVisible = (getAvailabilityStatus() == AVAILABLE);
final int mode = mTelephonyManager.getCdmaRoamingMode(); listPreference.setVisible(isVisible);
if (mode != TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT) { if (!isVisible) {
if (mode == TelephonyManager.CDMA_ROAMING_MODE_HOME return;
|| mode == TelephonyManager.CDMA_ROAMING_MODE_ANY) {
listPreference.setValue(Integer.toString(mode));
} else {
resetCdmaRoamingModeToDefault();
}
} }
boolean hasTelephonyMgr = mTelephonyManager != null;
try {
final int mode =
hasTelephonyMgr ? mTelephonyManager.getCdmaRoamingMode()
: TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT;
if (mode != TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT) {
if (mode == TelephonyManager.CDMA_ROAMING_MODE_HOME
|| mode == TelephonyManager.CDMA_ROAMING_MODE_ANY) {
listPreference.setValue(Integer.toString(mode));
} else {
resetCdmaRoamingModeToDefault();
}
}
final int settingsNetworkMode = MobileNetworkUtils.getNetworkTypeFromRaf( final int settingsNetworkMode =
(int) mTelephonyManager.getAllowedNetworkTypesForReason( hasTelephonyMgr ? MobileNetworkUtils.getNetworkTypeFromRaf(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER)); (int) mTelephonyManager.getAllowedNetworkTypesForReason(
final boolean enableList = settingsNetworkMode != NETWORK_MODE_LTE_GSM_WCDMA TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER))
&& settingsNetworkMode != NETWORK_MODE_NR_LTE_GSM_WCDMA; : NETWORK_MODE_UNKNOWN;
listPreference.setEnabled(enableList); 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 @Override