Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e597bb85 authored Oct 22, 2020 by Hall Liu Committed by Gerrit Code Review Oct 22, 2020

Merge "Add methods to check if MMS is always allowed"

parents bd0f4fed 2729c6f9

src/java/com/android/internal/telephony/dataconnection/DataEnabledOverride.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -365,6 +365,10 @@ public class DataEnabledOverride {
	return mRules.contains(OVERRIDE_RULE_ALLOW_DATA_DURING_VOICE_CALL);		return mRules.contains(OVERRIDE_RULE_ALLOW_DATA_DURING_VOICE_CALL);
	}		}

			public boolean isMmsAlwaysAllowed() {
			return mRules.contains(OVERRIDE_RULE_ALWAYS_ALLOW_MMS);
			}

	private boolean canSatisfyAnyRule(@ApnType int apnType,		private boolean canSatisfyAnyRule(@ApnType int apnType,
	@Condition int providedConditions) {		@Condition int providedConditions) {
	for (OverrideRule rule : mRules) {		for (OverrideRule rule : mRules) {

src/java/com/android/internal/telephony/dataconnection/DataEnabledSettings.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -300,6 +300,10 @@ public class DataEnabledSettings {
	return mDataEnabledOverride.isDataAllowedInVoiceCall();		return mDataEnabledOverride.isDataAllowedInVoiceCall();
	}		}

			public synchronized boolean isMmsAlwaysAllowed() {
			return mDataEnabledOverride.isMmsAlwaysAllowed();
			}

	public synchronized void setPolicyDataEnabled(boolean enabled) {		public synchronized void setPolicyDataEnabled(boolean enabled) {
	if (mPolicyDataEnabled != enabled) {		if (mPolicyDataEnabled != enabled) {
	localLog("PolicyDataEnabled", enabled);		localLog("PolicyDataEnabled", enabled);