From 17ba8166a329595b2e5b83c8ca1b2b19a07dfe2e Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Fri, 25 Sep 2020 11:15:02 -0700 Subject: [PATCH] Replace TelephonyManager methods for mobile data 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 --- .../telephony/DataDuringCallsPreferenceController.java | 7 +++++-- .../network/telephony/MmsMessagePreferenceController.java | 5 ++++- .../telephony/MmsMessagePreferenceControllerTest.java | 6 ++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java index 625f86303b4..1cd0e8e464b 100644 --- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java +++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java @@ -90,12 +90,15 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen @Override public boolean isChecked() { - return mManager.isDataAllowedInVoiceCall(); + return mManager.isMobileDataPolicyEnabled( + TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL); } @Override public boolean setChecked(boolean isChecked) { - mManager.setDataAllowedDuringVoiceCall(isChecked); + mManager.setMobileDataPolicyEnabledStatus( + TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL, + isChecked); return true; } diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java index 07b808fc445..e3db5ebb47c 100644 --- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java +++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java @@ -88,7 +88,10 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon @Override 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 diff --git a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java index a6126572a2f..c28c28cc1b8 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java @@ -115,9 +115,11 @@ public class MmsMessagePreferenceControllerTest { @Test public void setChecked_setDataIntoSubscriptionManager() { mController.setChecked(true); - verify(mTelephonyManager).setAlwaysAllowMmsData(true); + verify(mTelephonyManager).setMobileDataPolicyEnabledStatus( + TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true); mController.setChecked(false); - verify(mTelephonyManager).setAlwaysAllowMmsData(false); + verify(mTelephonyManager).setMobileDataPolicyEnabledStatus( + TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false); } }