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

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

Change-Id: I8780119041580b96c823b76ba944599484ac317f
This commit is contained in:
Sarah Chin
2020-11-20 04:08:18 +00:00
committed by Automerger Merge Worker
parent a86bc76ef9 04b9046ec6
commit caa76d8261
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,14 +67,15 @@ public class CdmaSubscriptionPreferenceController extends CdmaBasePreferenceCont
public boolean onPreferenceChange(Preference preference, Object object) { public boolean onPreferenceChange(Preference preference, Object object) {
final int newMode = Integer.parseInt((String) object); final int newMode = Integer.parseInt((String) object);
//TODO(b/117611981): only set it in one place //TODO(b/117611981): only set it in one place
if (mTelephonyManager.setCdmaSubscriptionMode(newMode)) { try {
mTelephonyManager.setCdmaSubscriptionMode(newMode);
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_SUBSCRIPTION_MODE, newMode); Settings.Global.CDMA_SUBSCRIPTION_MODE, newMode);
return true; return true;
} } catch (IllegalStateException e) {
return false; return false;
} }
}
@VisibleForTesting @VisibleForTesting
boolean deviceSupportsNvAndRuim() { boolean deviceSupportsNvAndRuim() {

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

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

3
tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.network.telephony.cdma;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -86,8 +85,6 @@ public class CdmaSubscriptionPreferenceControllerTest {
@Test @Test
public void onPreferenceChange_selectNV_returnNVMode() { public void onPreferenceChange_selectNV_returnNVMode() {
doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
mController.onPreferenceChange(mPreference, Integer.toString( mController.onPreferenceChange(mPreference, Integer.toString(
TelephonyManager.CDMA_SUBSCRIPTION_NV)); TelephonyManager.CDMA_SUBSCRIPTION_NV));

2
tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.network.telephony.cdma;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -92,7 +91,6 @@ public class CdmaSystemSelectPreferenceControllerTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE, Settings.Global.CDMA_ROAMING_MODE,
TelephonyManager.CDMA_ROAMING_MODE_ANY); TelephonyManager.CDMA_ROAMING_MODE_ANY);
doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());
mController.onPreferenceChange(mPreference, mController.onPreferenceChange(mPreference,
Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME)); Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));