From b935e68c2ddb4fa1e4e8c5c3d6375d82c63429f1 Mon Sep 17 00:00:00 2001 From: andychou Date: Thu, 11 Apr 2019 23:40:49 +0800 Subject: [PATCH] Fix NetworkControllerDataTest fail if inflateSignalStrength is true NetworkControllerBaseTest doesn't consider inflate signal strength condition. Consider inflate condition when compare icon. Bug: 130317133 Test: atest NetworkControllerDataTest pass Change-Id: I2f9e994cb169001d4081ecead3702f9ef00234ff --- .../systemui/statusbar/policy/MobileSignalController.java | 3 ++- .../statusbar/policy/NetworkControllerBaseTest.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 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 8f135c80a1d04..11e5625f8538f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -75,7 +75,8 @@ public class MobileSignalController extends SignalController< private SignalStrength mSignalStrength; private MobileIconGroup mDefaultIcons; private Config mConfig; - private boolean mInflateSignalStrengths = false; + @VisibleForTesting + boolean mInflateSignalStrengths = false; // Some specific carriers have 5GE network which is special LTE CA network. private static final int NETWORK_TYPE_LTE_CA_5GE = TelephonyManager.MAX_NETWORK_TYPE + 1; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index 4fe18b486b9f0..ce5bfced961be 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -428,8 +428,12 @@ public class NetworkControllerBaseTest extends SysuiTestCase { IconState iconState = iconArg.getValue(); - int state = SignalDrawable.getState(icon, SignalStrength.NUM_SIGNAL_STRENGTH_BINS, - cutOut); + int numSignalStrengthBins = SignalStrength.NUM_SIGNAL_STRENGTH_BINS; + if (mMobileSignalController.mInflateSignalStrengths) { + numSignalStrengthBins++; + icon++; + } + int state = SignalDrawable.getState(icon, numSignalStrengthBins, cutOut); assertEquals("Data icon in status bar", typeIcon, (int) typeIconArg.getValue()); assertEquals("Signal icon in status bar", state, iconState.icon); assertEquals("Visibility in status bar", visible, iconState.visible);