Merge branch 'jb-release' of https://android.googlesource.com/platform/frameworks/base into aosp (5c189c5c) · Commits · e / os / android_frameworks_base

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

+19 −11

Original line number	Diff line number	Diff line
		@@ -571,18 +571,26 @@ public class NetworkController extends BroadcastReceiver {
		R.string.accessibility_data_connection_HP);
		break;
		case TelephonyManager.NETWORK_TYPE_CDMA:
		if (!mShowAtLeastThreeGees) {
		// display 1xRTT for IS95A/B
		mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
		mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
		mContentDescriptionDataType = mContext.getString(
		R.string.accessibility_data_connection_cdma);
		break;
		} else {
		// fall through
		}
		case TelephonyManager.NETWORK_TYPE_1xRTT:
		if (!mShowAtLeastThreeGees) {
		mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
		mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
		mContentDescriptionDataType = mContext.getString(
		R.string.accessibility_data_connection_cdma);
		break;
		} else {
		// fall through
		}
		case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through
		case TelephonyManager.NETWORK_TYPE_EVDO_A:
		case TelephonyManager.NETWORK_TYPE_EVDO_B:

+2 −1

Original line number	Diff line number	Diff line
		@@ -1381,7 +1381,8 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		mZoneTime = c.getTimeInMillis();
		}
		if (DBG) {
		log("NITZ: tzOffset=" + tzOffset + " dst=" + dst + " zone=" + zone.getID() +
		log("NITZ: tzOffset=" + tzOffset + " dst=" + dst + " zone=" +
		(zone!=null ? zone.getID() : "NULL") +
		" iso=" + iso + " mGotCountryCode=" + mGotCountryCode +
		" mNeedFixZone=" + mNeedFixZone);
		}