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

Commit 74ae92ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tear down voice call before powering down" am: ed8efea5 

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



Change-Id: I4900841aff6f2996afdd4aafce0161f1acc59a41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46da9c93 ed8efea5

src/java/com/android/internal/telephony/ServiceStateTracker.java

+6 −0
Original line number Diff line number Diff line
@@ -4992,6 +4992,12 @@ public class ServiceStateTracker extends Handler { 
        synchronized (this) {

            if (!mPendingRadioPowerOffAfterDataOff) {

                if (mPhone.isUsingNewDataStack()) {

                    // hang up all active voice calls first

                    if (mPhone.isPhoneTypeGsm() && mPhone.isInCall()) {

                        mPhone.mCT.mRingingCall.hangupIfAlive();

                        mPhone.mCT.mBackgroundCall.hangupIfAlive();

                        mPhone.mCT.mForegroundCall.hangupIfAlive();

                    }

                    if (mAnyDataExisting) {

                        log("powerOffRadioSafely: Tear down all data networks.");

                        mPhone.getDataNetworkController().tearDownAllDataNetworks(