From 4bdbd135fb4620fb8990435a1cc4bd0edba8e454 Mon Sep 17 00:00:00 2001 From: changbetty Date: Tue, 24 Dec 2019 15:42:12 +0800 Subject: [PATCH] [Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline Bug: 146309719 Test: make RunSettingsRoboTests ROBOTEST_FILTER=MmsMessagePreferenceControllerTest Change-Id: Ia591e82e1a55f36c98e7b00965532ff0762e1e77 Merged-In: Ia591e82e1a55f36c98e7b00965532ff0762e1e77 --- .../network/telephony/MmsMessagePreferenceController.java | 2 +- .../network/telephony/MmsMessagePreferenceControllerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java index c1f294977eb..3503099c6c7 100644 --- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java +++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java @@ -97,7 +97,7 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon @Override public boolean setChecked(boolean isChecked) { - return mSubscriptionManager.setAlwaysAllowMmsData(mSubId, isChecked); + return mTelephonyManager.setAlwaysAllowMmsData(isChecked); } @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 0263fe9fdcd..a6126572a2f 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,9 @@ public class MmsMessagePreferenceControllerTest { @Test public void setChecked_setDataIntoSubscriptionManager() { mController.setChecked(true); - verify(mSubscriptionManager).setAlwaysAllowMmsData(SUB_ID, true); + verify(mTelephonyManager).setAlwaysAllowMmsData(true); mController.setChecked(false); - verify(mSubscriptionManager).setAlwaysAllowMmsData(SUB_ID, false); + verify(mTelephonyManager).setAlwaysAllowMmsData(false); } }