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

Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a

Browse Source 
Change-Id: I222f5d247438e1a64c0c33123555b97c1b3c5dfd
This commit is contained in:
Automerger Merge Worker
2020-02-04 02:55:31 +00:00
parent 35ffa52384 cc9aef705a
commit 30d7fd79c9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) {
return mSubscriptionManager.setAlwaysAllowMmsData(mSubId, isChecked); return mTelephonyManager.setAlwaysAllowMmsData(isChecked);
} }
@Override @Override

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

@@ -115,9 +115,9 @@ public class MmsMessagePreferenceControllerTest {
@Test @Test
public void setChecked_setDataIntoSubscriptionManager() { public void setChecked_setDataIntoSubscriptionManager() {
mController.setChecked(true); mController.setChecked(true);
verify(mSubscriptionManager).setAlwaysAllowMmsData(SUB_ID, true); verify(mTelephonyManager).setAlwaysAllowMmsData(true);
mController.setChecked(false); mController.setChecked(false);
verify(mSubscriptionManager).setAlwaysAllowMmsData(SUB_ID, false); verify(mTelephonyManager).setAlwaysAllowMmsData(false);
} }
} }