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

This commit is contained in:
Betty Chang
2020-01-07 02:41:53 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -88,7 +88,7 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon
@Override
public boolean setChecked(boolean isChecked) {
return mSubscriptionManager.setAlwaysAllowMmsData(mSubId, isChecked);
return mTelephonyManager.setAlwaysAllowMmsData(isChecked);
}
@Override

View File

@@ -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);
}
}