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

Commit fd9bb1fd authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

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

am: a2793ccd

Change-Id: I2ad0fb0d179dd49a29d0a42d39bd6f7a4d12cd78
parents 66404926 a2793ccd

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) {