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

Commit 39693f68 authored Oct 22, 2020 by Hall Liu Committed by Automerger Merge Worker Oct 22, 2020

Merge "Add methods to check if MMS is always allowed" am: e597bb85

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1469910

Change-Id: I9c0dec69923d947d524bb58b8c4a06b8ae2f27b6

parents e1845639 e597bb85

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -365,6 +365,10 @@ public class DataEnabledOverride {
		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,
		@Condition int providedConditions) {
		for (OverrideRule rule : mRules) {

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

+4 −0

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

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

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