From 68931a69114b1baefa66046478e512b2a855c530 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Tue, 2 Feb 2021 12:09:48 -0800 Subject: [PATCH] Rename setMobileDataPolicyEnabledStatus Rename to setMobileDataPolicyEnabled per API council comments Fixes: 171804465 Test: atest TelephonyManagerTest Change-Id: Ib9ff4ee01e2af4d3fd368afffa36226100f11e2d --- .../telephony/DataDuringCallsPreferenceController.java | 2 +- .../network/telephony/MmsMessagePreferenceController.java | 2 +- .../network/telephony/MmsMessagePreferenceControllerTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java index 1cd0e8e464b..110c5823de3 100644 --- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java +++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java @@ -96,7 +96,7 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen @Override public boolean setChecked(boolean isChecked) { - mManager.setMobileDataPolicyEnabledStatus( + mManager.setMobileDataPolicyEnabled( 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 e3db5ebb47c..85d6e73dd42 100644 --- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java +++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java @@ -88,7 +88,7 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon @Override public boolean setChecked(boolean isChecked) { - mTelephonyManager.setMobileDataPolicyEnabledStatus( + mTelephonyManager.setMobileDataPolicyEnabled( TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked); return isChecked == mTelephonyManager.isMobileDataPolicyEnabled( TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED); diff --git a/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java index 67f5f1a751e..a0219a02891 100644 --- a/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java @@ -111,11 +111,11 @@ public class MmsMessagePreferenceControllerTest { @Test public void setChecked_setDataIntoSubscriptionManager() { mController.setChecked(true); - verify(mTelephonyManager).setMobileDataPolicyEnabledStatus( + verify(mTelephonyManager).setMobileDataPolicyEnabled( TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true); mController.setChecked(false); - verify(mTelephonyManager).setMobileDataPolicyEnabledStatus( + verify(mTelephonyManager).setMobileDataPolicyEnabled( TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false); } }