Merge "Fix network name not showing in QS sometimes" into mnc-dev

Monkopedia · Android (Google) Code Review · commit 350662197542 · 2015-07-28T18:05:49.000Z
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -25,6 +25,7 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -389,7 +390,7 @@ private final void updateTelephony() {
         }
         // Fill in the network name if we think we have it.
         if (mCurrentState.networkName == mNetworkNameDefault && mServiceState != null
-                && mServiceState.getOperatorAlphaShort() != null) {
+                && !TextUtils.isEmpty(mServiceState.getOperatorAlphaShort())) {
             mCurrentState.networkName = mServiceState.getOperatorAlphaShort();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import android.telephony.SubscriptionInfo;`
`26`	`26`	`import android.telephony.SubscriptionManager;`
`27`	`27`	`import android.telephony.TelephonyManager;`
	`28`	`+import android.text.TextUtils;`
`28`	`29`	`import android.util.Log;`
`29`	`30`	`import android.util.SparseArray;`
`30`	`31`
`@@ -389,7 +390,7 @@ private final void updateTelephony() {`
`389`	`390`	`}`
`390`	`391`	`// Fill in the network name if we think we have it.`
`391`	`392`	`if (mCurrentState.networkName == mNetworkNameDefault && mServiceState != null`
`392`		`- && mServiceState.getOperatorAlphaShort() != null) {`
	`393`	`+ && !TextUtils.isEmpty(mServiceState.getOperatorAlphaShort())) {`
`393`	`394`	`mCurrentState.networkName = mServiceState.getOperatorAlphaShort();`
`394`	`395`	`}`
`395`	`396`