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

Replace TelephonyManager methods for mobile data

Browse Source 
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.

Exempt-From-Owner-Approval: Cherry-picked from internal
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
Merged-In: I7ebae37373d53fb2c59b6b546232dbddf77398d4
This commit is contained in:
Hall Liu
2020-09-25 11:15:02 -07:00
parent 21846b228b
commit 17ba8166a3
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,12 +90,15 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return mManager.isDataAllowedInVoiceCall(); return mManager.isMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL);
} }
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
mManager.setDataAllowedDuringVoiceCall(isChecked); mManager.setMobileDataPolicyEnabledStatus(
TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,
isChecked);
return true; return true;
} }

5
src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
View File

@@ -88,7 +88,10 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
return mTelephonyManager.setAlwaysAllowMmsData(isChecked); mTelephonyManager.setMobileDataPolicyEnabledStatus(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);
return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);
} }
@Override @Override

6
tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
View File

@@ -115,9 +115,11 @@ public class MmsMessagePreferenceControllerTest {
@Test @Test
public void setChecked_setDataIntoSubscriptionManager() { public void setChecked_setDataIntoSubscriptionManager() {
mController.setChecked(true); mController.setChecked(true);
verify(mTelephonyManager).setAlwaysAllowMmsData(true); verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);
mController.setChecked(false); mController.setChecked(false);
verify(mTelephonyManager).setAlwaysAllowMmsData(false); verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);
} }
} }