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

Commit a2793ccd authored by Brad Ebinger's avatar Brad Ebinger
Browse files

resolve merge conflicts of 6b0d9a09 to stage-aosp-master 

Change-Id: Ic406e5468690f8a6e771a77c921dd49718f76b21
parents cdf57730 6b0d9a09

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

+5 −0
Original line number Diff line number Diff line
@@ -2850,6 +2850,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) {