Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321d7

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

Change-Id: I8f111bf136e9ce7ef53a91468cdb10ff571eec2f
This commit is contained in:
Treehugger Robot
2020-06-25 18:01:55 +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();
}