Merge "MobileSignalController removes the code for icon reset." into rvc-dev am: 3067788878 am: 6f29edb132

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

Change-Id: I3810360d3a675090a95d76ac72ea39880b733c1d
This commit is contained in:
TreeHugger Robot
2020-06-04 17:35:21 +00:00
committed by Automerger Merge Worker

View File

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