Fix roaming icon when not default signal

Bug: 22183802
Change-Id: I0d38f23d81b79e53e3d92db8c6f6a1455a94da4c
This commit is contained in:
Jason Monk
2015-07-08 14:19:25 -04:00
parent 32c4802a8a
commit 61633f1861
2 changed files with 3 additions and 1 deletions

View File

@@ -223,7 +223,8 @@ public class MobileSignalController extends SignalController<
boolean activityOut = mCurrentState.dataConnected
&& !mCurrentState.carrierNetworkChangeMode
&& mCurrentState.activityOut;
showDataIcon &= mCurrentState.isDefault;
showDataIcon &= mCurrentState.isDefault
|| mCurrentState.iconGroup == TelephonyIcons.ROAMING;
int typeIcon = showDataIcon ? icons.mDataType : 0;
mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon,
activityIn, activityOut, dataContentDescription, description, icons.mIsWide,

View File

@@ -127,6 +127,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
setupDefaultSignal();
setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
setGsmRoaming(true);
setLevel(testStrength);