Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix NetworkControllerDataTest fail if inflateSignalStrength is true" into qt-dev am: 1970cfddb3" into qt-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-04-11 18:10:47 +00:00
committed by Android (Google) Code Review
parent a76674f153 0f5a4d6c16
commit eadbe7c53c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
View File

@@ -75,7 +75,8 @@ public class MobileSignalController extends SignalController<
private SignalStrength mSignalStrength; private SignalStrength mSignalStrength;
private MobileIconGroup mDefaultIcons; private MobileIconGroup mDefaultIcons;
private Config mConfig; private Config mConfig;
private boolean mInflateSignalStrengths = false; @VisibleForTesting
boolean mInflateSignalStrengths = false;
// Some specific carriers have 5GE network which is special LTE CA network. // 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; private static final int NETWORK_TYPE_LTE_CA_5GE = TelephonyManager.MAX_NETWORK_TYPE + 1;

8
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
View File

@@ -428,8 +428,12 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
IconState iconState = iconArg.getValue(); IconState iconState = iconArg.getValue();
int state = SignalDrawable.getState(icon, SignalStrength.NUM_SIGNAL_STRENGTH_BINS, int numSignalStrengthBins = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
cutOut); if (mMobileSignalController.mInflateSignalStrengths) {
numSignalStrengthBins++;
icon++;
}
int state = SignalDrawable.getState(icon, numSignalStrengthBins, cutOut);
assertEquals("Data icon in status bar", typeIcon, (int) typeIconArg.getValue()); assertEquals("Data icon in status bar", typeIcon, (int) typeIconArg.getValue());
assertEquals("Signal icon in status bar", state, iconState.icon); assertEquals("Signal icon in status bar", state, iconState.icon);
assertEquals("Visibility in status bar", visible, iconState.visible); assertEquals("Visibility in status bar", visible, iconState.visible);