From fccdae88d9c9837ca41684dddc696079012a888d Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Thu, 28 May 2020 22:20:34 +0800 Subject: [PATCH 1/2] Add the log at onDataConnectionStateChanged do reset displayInfo Bug: 157517635 Test: build pass. Change-Id: I7f987d776a33842e0cff426854da07ee799ae5ca Merged-In: I7f987d776a33842e0cff426854da07ee799ae5ca --- .../systemui/statusbar/policy/MobileSignalController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 17481bf601e1c..0aab94d8975b6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -652,6 +652,8 @@ public class MobileSignalController extends SignalController< } 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); } From e5eb670c8c14b3f61b283d3d702b5d32cf2ff28f Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 2 Jun 2020 22:53:06 +0800 Subject: [PATCH 2/2] MobileSignalController removes the code for icon reset. 1. onDataConnectionStateChanged remove the code for icon reset. 2. update servicestate immediately. Bug: 157710254 Test: build pass. Change-Id: I4678ace5b16ad06eacd8abf268960dd3bdb5a77f Merged-In: I4678ace5b16ad06eacd8abf268960dd3bdb5a77f --- .../statusbar/policy/MobileSignalController.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 0aab94d8975b6..c8aa22fc28f80 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -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(); }