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

Commit 6b899e4a 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

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

Change-Id: I2b7e80b8dc251f6423772149a136a65bc5b7cdad
parents 92b665ce 815a3fdd
Loading
Loading
Loading
Loading
+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();
        }