Always show appropriate mobile service label.

Kazuhiro Ondo · dsandler · commit 32f470017246 · 2012-01-19T20:25:26.000-05:00
Fix for Carrier Verification case failure for not showing
"no internet connection" text on expanded status bar while
mobile data connection is not CONNECTED state.

Bug:5884774
Change-Id: I433d5de626b9b0cff20d192cb6aae214f3e014b3
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -913,6 +913,9 @@ void refreshViews() {
             combinedActivityIconId = mMobileActivityIconId;
             combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
             mContentDescriptionCombinedSignal = mContentDescriptionDataType;
+        } else {
+            mobileLabel = mHasMobileDataFeature ?
+                context.getString(R.string.status_bar_settings_signal_meter_disconnected) : "";
         }
 
         if (mWifiConnected) {

Original file line number	Diff line number	Diff line change
`@@ -913,6 +913,9 @@ void refreshViews() {`
`913`	`913`	`combinedActivityIconId = mMobileActivityIconId;`
`914`	`914`	`combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()`
`915`	`915`	`mContentDescriptionCombinedSignal = mContentDescriptionDataType;`
	`916`	`+ } else {`
	`917`	`+ mobileLabel = mHasMobileDataFeature ?`
	`918`	`+ context.getString(R.string.status_bar_settings_signal_meter_disconnected) : "";`
`916`	`919`	`}`
`917`	`920`
`918`	`921`	`if (mWifiConnected) {`