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

Commit 82795500 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Fix empty signal strength bar shows after turning radio on" am:... 

Merge "Fix empty signal strength bar shows after turning radio on" am: d217974c am: 125614a0 am: 5d35e7a1

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

Change-Id: I58a39fbbbaacd488537cd3d4b01517b67b0b6989
parents adae5ffa 5d35e7a1

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

+15 −2
Original line number Diff line number Diff line
@@ -3524,6 +3524,9 @@ public class ServiceStateTracker extends Handler { 
        boolean hasAirplaneModeOnChanged =

                mSS.getState() != ServiceState.STATE_POWER_OFF

                        && mNewSS.getState() == ServiceState.STATE_POWER_OFF;

        boolean hasAirplaneModeOffChanged =

                mSS.getState() == ServiceState.STATE_POWER_OFF

                        && mNewSS.getState() != ServiceState.STATE_POWER_OFF;



        SparseBooleanArray hasDataAttached = new SparseBooleanArray(

                mTransportManager.getAvailableTransports().length);
@@ -3887,6 +3890,14 @@ public class ServiceStateTracker extends Handler { 
            }

        }



        // Before starting to poll network state, the signal strength will be

        // reset under radio power off, so here expects to query it again

        // because the signal strength might come earlier RAT and radio state

        // changed.

        if (hasAirplaneModeOffChanged) {

            mCi.getSignalStrength(obtainMessage(EVENT_GET_SIGNAL_STRENGTH));

        }



        if (shouldLogAttachedChange) {

            logAttachChange();

        }
@@ -5261,8 +5272,10 @@ public class ServiceStateTracker extends Handler { 


        // This signal is used for both voice and data radio signal so parse

        // all fields



        if ((ar.exception == null) && (ar.result != null)) {

        // Under power off, let's suppress valid signal strength report, which is

        // beneficial to avoid icon flickering.

        if ((ar.exception == null) && (ar.result != null)

                && mSS.getState() != ServiceState.STATE_POWER_OFF) {

            mSignalStrength = (SignalStrength) ar.result;



            PersistableBundle config = getCarrierConfig();