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

Commit 2a4b3ede authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321 

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

Change-Id: I8f111bf136e9ce7ef53a91468cdb10ff571eec2f
parents 5575e408 1ad68321

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();

        }