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

Commit 9fd25683 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix synchronization of mPendingRadioPowerOffAfterDataOff." am:... 

Merge "Fix synchronization of mPendingRadioPowerOffAfterDataOff." am: c71bc1bb am: 226adb42 am: 4eebb891

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



Change-Id: I76bd08d50100d544ba73f4e73de69276645b1199
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87868f48 4eebb891

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

+20 −17
Original line number Diff line number Diff line
@@ -221,8 +221,9 @@ public class ServiceStateTracker extends Handler { 
    private final RegistrantList mAirplaneModeChangedRegistrants = new RegistrantList();

    private final RegistrantList mAreaCodeChangedRegistrants = new RegistrantList();



    /* Radio power off pending flag and tag counter */

    private boolean mPendingRadioPowerOffAfterDataOff = false;

    /* Radio power off pending flag */

    // @GuardedBy("this")

    private volatile boolean mPendingRadioPowerOffAfterDataOff = false;



    /** Waiting period before recheck gprs and voice registration. */

    public static final int DEFAULT_GPRS_CHECK_PERIOD_MILLIS = 60 * 1000;
@@ -1458,6 +1459,7 @@ public class ServiceStateTracker extends Handler { 


            case EVENT_ALL_DATA_DISCONNECTED:

                log("EVENT_ALL_DATA_DISCONNECTED");

                synchronized (this) {

                    if (!mPendingRadioPowerOffAfterDataOff) return;

                    boolean areAllDataDisconnectedOnAllPhones = true;

                    for (Phone phone : PhoneFactory.getPhones()) {
@@ -1477,6 +1479,7 @@ public class ServiceStateTracker extends Handler { 
                        if (DBG) log("Data disconnected for all phones, turn radio off now.");

                        hangupAndPowerOff();

                    }

                }

                break;



            case EVENT_CHANGE_IMS_STATE: