Merge "Telepony: Update data icon when sim removed(CDMA)" (61fabe52) · Commits · e / os / android_frameworks_base

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

+2 −11

Original line number	Diff line number	Diff line
		@@ -894,9 +894,8 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl {
		if (mDataNetType == TelephonyManager.NETWORK_TYPE_UNKNOWN) {
		// If data network type is unknown do not display data icon
		visible = false;
		} else if (!isCdma(phoneId)) {
		} else {
		Slog.d(TAG,"updateDataIcon when gsm mMSimState =" + mMSimState[phoneId]);
		// GSM case, we have to check also the sim state
		if (mMSimState[phoneId] == IccCardConstants.State.READY \|\|
		mMSimState[phoneId] == IccCardConstants.State.UNKNOWN) {
		mNoSim = false;
		@@ -913,14 +912,6 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl {
		iconId = TelephonyIcons.getNoSimIcon();
		visible = false; // no SIM? no data
		}
		} else {
		// CDMA case, mMSimDataActivity can be also DATA_ACTIVITY_DORMANT
		if (mDataState == TelephonyManager.DATA_CONNECTED) {
		iconId = TelephonyIcons.getDataActivity(phoneId, mDataActivity);
		} else {
		iconId = 0;
		visible = false;
		}
		}

		mMSimDataDirectionIconId[phoneId] = iconId;