| commit | 4bdbd135fb4620fb8990435a1cc4bd0edba8e454 | [log] [tgz] |
|---|---|---|
| author | changbetty <changbetty@google.com> | Tue Dec 24 15:42:12 2019 +0800 |
| committer | changbetty <changbetty@google.com> | Fri Jan 10 17:15:09 2020 +0800 |
| tree | f0811cb79a341dd537bffd608fe667dad832b888 | |
| parent | cd4113ba5c72b6d224a24894459567e936dbac9b [diff] |
[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline Bug: 146309719 Test: make RunSettingsRoboTests ROBOTEST_FILTER=MmsMessagePreferenceControllerTest Change-Id: Ia591e82e1a55f36c98e7b00965532ff0762e1e77 Merged-In: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java index c1f2949..3503099 100644 --- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java +++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
@@ -97,7 +97,7 @@ @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 0263fe9..a612657 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 @@ @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); } }