Merge "Pull roaming from mServiceState for consistency" into lmp-dev (e7b18d2b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+15 −26

Original line number	Diff line number	Diff line
		@@ -646,20 +646,11 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mLastSignalLevel = iconLevel = mSignalStrength.getLevel();
		}

		if (isCdma()) {
		if (isCdmaEri()) {
		iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition];
		} else {
		iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[mInetCondition];
		}
		} else {
		// Though mPhone is a Manager, this call is not an IPC
		if (mPhone.isNetworkRoaming()) {
		if (isRoaming()) {
		iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition];
		} else {
		iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[mInetCondition];
		}
		}
		mPhoneSignalIconId = iconList[iconLevel];
		mQSPhoneSignalIconId =
		TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[mInetCondition][iconLevel];
		@@ -811,12 +802,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		}
		}

		if (isCdma()) {
		if (isCdmaEri()) {
		mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
		mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
		}
		} else if (mPhone.isNetworkRoaming()) {
		if (isRoaming()) {
		mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
		mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
		}
		@@ -836,6 +822,14 @@ public class NetworkControllerImpl extends BroadcastReceiver
		return false;
		}

		private boolean isRoaming() {
		if (isCdma()) {
		return isCdmaEri();
		} else {
		return mServiceState != null && mServiceState.getRoaming();
		}
		}

		private final void updateDataIcon() {
		int iconId;
		boolean visible = true;
		@@ -1233,12 +1227,7 @@ public class NetworkControllerImpl extends BroadcastReceiver

		mDataTypeIconId = 0;
		mQSDataTypeIconId = 0;
		if (isCdma()) {
		if (isCdmaEri()) {
		mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
		mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
		}
		} else if (mPhone.isNetworkRoaming()) {
		if (isRoaming()) {
		mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
		mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
		}