Merge "Modify isRoaming to getRoaming from Service state tracker." (1ee5b0b9) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -775,7 +775,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl {

		private boolean isRoaming(int phoneId) {
		return (isCdma(phoneId) ? isCdmaEri(phoneId)
		: mPhone.isNetworkRoaming(phoneId));
		: mMSimServiceState[phoneId] != null && mMSimServiceState[phoneId].getRoaming());
		}

		private final void updateDataNetType(int phoneId) {
		@@ -815,7 +815,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl {
		mQSDataTypeIconId = R.drawable.stat_sys_data_fully_connected_roam;
		}
		}
		} else if (mPhone.isNetworkRoaming(phoneId)) {
		} else if (isRoaming(phoneId)) {
		mMSimDataTypeIconId[phoneId] = R.drawable.stat_sys_data_fully_connected_roam;
		setQSDataTypeIcon = true;
		if (phoneId == dataSub) {
		@@ -1200,7 +1200,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl {
		mQSDataTypeIconId = R.drawable.stat_sys_data_fully_connected_roam;
		}
		}
		} else if (mPhone.isNetworkRoaming(phoneId)) {
		} else if (isRoaming(phoneId)) {
		mMSimDataTypeIconId[phoneId] = R.drawable.stat_sys_data_fully_connected_roam;
		if (phoneId == dataSub) {
		mQSDataTypeIconId = R.drawable.stat_sys_data_fully_connected_roam;