Merge "Display roaming indicator icon only based on ERI in CDMA case." (cec507f2) · Commits · e / os / android_frameworks_base

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -588,7 +588,11 @@ public class NetworkController extends BroadcastReceiver {
		}
		}

		if ((isCdma() && isCdmaEri()) \|\| mPhone.isNetworkRoaming()) {
		if (isCdma()) {
		if (isCdmaEri()) {
		mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
		}
		} else if (mPhone.isNetworkRoaming()) {
		mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
		}
		}
		@@ -1019,10 +1023,13 @@ public class NetworkController extends BroadcastReceiver {
		mContentDescriptionCombinedSignal = mHasMobileDataFeature
		? mContentDescriptionDataType : mContentDescriptionWifi;

		if ((isCdma() && isCdmaEri()) \|\| mPhone.isNetworkRoaming()) {
		mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
		} else {
		mDataTypeIconId = 0;
		if (isCdma()) {
		if (isCdmaEri()) {
		mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
		}
		} else if (mPhone.isNetworkRoaming()) {
		mDataTypeIconId = R.drawable.stat_sys_data_connected_roam;
		}
		}