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

Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260 am: 04b9046ec6 am: caa76d8261

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

Change-Id: I3305ed2659027a109672c10a06b70300c66ba80e
This commit is contained in:
Sarah Chin
2020-11-20 04:43:00 +00:00
committed by Automerger Merge Worker
parent 5c0a32c3de caa76d8261
commit 111a371005
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
View File

@@ -67,13 +67,14 @@ public class CdmaSubscriptionPreferenceController extends CdmaBasePreferenceCont
public boolean onPreferenceChange(Preference preference, Object object) {
final int newMode = Integer.parseInt((String) object);
//TODO(b/117611981): only set it in one place
if (mTelephonyManager.setCdmaSubscriptionMode(newMode)) {
try {
mTelephonyManager.setCdmaSubscriptionMode(newMode);
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_SUBSCRIPTION_MODE, newMode);
return true;
} catch (IllegalStateException e) {
return false;
}
return false;
}
@VisibleForTesting

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

@@ -63,13 +63,14 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
public boolean onPreferenceChange(Preference preference, Object object) {
int newMode = Integer.parseInt((String) object);
//TODO(b/117611981): only set it in one place
if (mTelephonyManager.setCdmaRoamingMode(newMode)) {
try {
mTelephonyManager.setCdmaRoamingMode(newMode);
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE, newMode);
return true;
} catch (IllegalStateException e) {
return false;
}
return false;
}
private void resetCdmaRoamingModeToDefault() {