resolve merge conflicts of 6b0d9a09f to stage-aosp-master am: a2793ccd4f (ca9f50fa) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -2851,6 +2851,11 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		return;
		}

		if (mIgnoreDataEnabledChangedForVideoCalls) {
		log("Ignore data " + ((enabled) ? "enabled" : "disabled") + " due to carrier policy.");
		return;
		}

		if (!enabled) {
		int reasonCode;
		if (reason == DataEnabledSettings.REASON_POLICY_DATA_ENABLED) {