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

Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev

Browse Source
This commit is contained in:
Hall Liu
2021-02-03 19:54:14 +00:00
committed by Android (Google) Code Review
parent e14dc177f3 68931a6911
commit 3717d5feda
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
mManager.setMobileDataPolicyEnabledStatus( mManager.setMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL, TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,
isChecked); isChecked);
return true; return true;

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

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

4
tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
View File

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