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

Commit c985d92a 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 am:... 

Merge "Tear down voice call before powering down" am: ed8efea5 am: 74ae92ce am: d0648560 am: 17e0f2ff

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



Change-Id: If3c3ae44f0a667d2c06ee07f90f1fb5f07dcd92e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea190c32 17e0f2ff

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

+6 −0
Original line number Diff line number Diff line
@@ -5010,6 +5010,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(