Merge "Replace TelephonyManager methods for mobile data"

This commit is contained in:
Hall Liu
2020-10-09 17:03:16 +00:00
committed by Android (Google) Code Review
4 changed files with 17 additions and 7 deletions

View File

@@ -90,12 +90,15 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen
@Override
public boolean isChecked() {
return mManager.isDataAllowedInVoiceCall();
return mManager.isMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL);
}
@Override
public boolean setChecked(boolean isChecked) {
mManager.setDataAllowedDuringVoiceCall(isChecked);
mManager.setMobileDataPolicyEnabledStatus(
TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,
isChecked);
return true;
}

View File

@@ -88,7 +88,10 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon
@Override
public boolean setChecked(boolean isChecked) {
return mTelephonyManager.setAlwaysAllowMmsData(isChecked);
mTelephonyManager.setMobileDataPolicyEnabledStatus(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);
return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);
}
@Override