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

Commit 6ace0cba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MobileSignalController removes the code for icon reset." into rvc-dev... 

Merge "MobileSignalController removes the code for icon reset." into rvc-dev am: 30677888 am: cf96425d am: 815a3fdd am: 6b899e4a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700110

Change-Id: I2da0e9929eacb892eff08a4c814d27458315b495
parents 03c2c52c 6b899e4a

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+1 −8
Original line number Diff line number Diff line
@@ -640,8 +640,7 @@ public class MobileSignalController extends SignalController< 
                        + " dataState=" + state.getDataRegistrationState());

            }

            mServiceState = state;

            // onDisplayInfoChanged is invoked directly after onServiceStateChanged, so not calling

            // updateTelephony() to prevent icon flickering in case of overrides.

            updateTelephony();

        }



        @Override
@@ -651,12 +650,6 @@ public class MobileSignalController extends SignalController< 
                        + " type=" + networkType);

            }

            mDataState = state;

            if (networkType != mTelephonyDisplayInfo.getNetworkType()) {

                Log.d(mTag, "onDataConnectionStateChanged:"

                        + " network type change and reset displayInfo. type=" + networkType);

                mTelephonyDisplayInfo = new TelephonyDisplayInfo(networkType,

                        TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);

            }

            updateTelephony();

        }