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

am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev

Browse Source 
* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
  Pull roaming from mServiceState for consistency
This commit is contained in:
Jason Monk
2014-10-01 17:00:05 +00:00
committed by Android Git Automerger
parent 8cc881257c 9e280c447f
commit 81ab90f217
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -646,19 +646,10 @@ public class NetworkControllerImpl extends BroadcastReceiver
mLastSignalLevel = iconLevel = mSignalStrength.getLevel(); mLastSignalLevel = iconLevel = mSignalStrength.getLevel();
} }
if (isCdma()) { if (isRoaming()) {
if (isCdmaEri()) { iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition];
iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition];
} else {
iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[mInetCondition];
}
} else { } else {
// Though mPhone is a Manager, this call is not an IPC iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[mInetCondition];
if (mPhone.isNetworkRoaming()) {
iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[mInetCondition];
} else {
iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[mInetCondition];
}
} }
mPhoneSignalIconId = iconList[iconLevel]; mPhoneSignalIconId = iconList[iconLevel];
mQSPhoneSignalIconId = mQSPhoneSignalIconId =
@@ -811,14 +802,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
} }
} }
if (isCdma()) { if (isRoaming()) {
if (isCdmaEri()) { mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
mDataTypeIconId = TelephonyIcons.ROAMING_ICON; mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
}
} else if (mPhone.isNetworkRoaming()) {
mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
} }
} }
@@ -836,6 +822,14 @@ public class NetworkControllerImpl extends BroadcastReceiver
return false; return false;
} }
private boolean isRoaming() {
if (isCdma()) {
return isCdmaEri();
} else {
return mServiceState != null && mServiceState.getRoaming();
}
}
private final void updateDataIcon() { private final void updateDataIcon() {
int iconId; int iconId;
boolean visible = true; boolean visible = true;
@@ -1233,12 +1227,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
mDataTypeIconId = 0; mDataTypeIconId = 0;
mQSDataTypeIconId = 0; mQSDataTypeIconId = 0;
if (isCdma()) { if (isRoaming()) {
if (isCdmaEri()) {
mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
}
} else if (mPhone.isNetworkRoaming()) {
mDataTypeIconId = TelephonyIcons.ROAMING_ICON; mDataTypeIconId = TelephonyIcons.ROAMING_ICON;
mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition]; mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition];
} }