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

Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70 am: 4af7d6a7d2 am: d51ee68578

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

Change-Id: I9c1496152155d3db0bd4c29502e7d43f6335ee86
This commit is contained in:
Hall Liu
2020-10-22 22:22:47 +00:00
committed by Automerger Merge Worker
parent 9493731935 d51ee68578
commit 9146943bb5
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);
} }
} }