summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-07-20 11:43:56 -0400
committerJason Monk <jmonk@google.com>2015-07-20 11:43:56 -0400
commit93fb68fdce8f0d28eaa77704e4b00933260b83dd (patch)
tree0b1c8a5122f807f867bb89a134f52e7a26c1ed87 /packages
parent29cf9aea5490c42b85aaaa98b6784daff82629f8 (diff)
downloadframeworks_base-93fb68fdce8f0d28eaa77704e4b00933260b83dd.zip
frameworks_base-93fb68fdce8f0d28eaa77704e4b00933260b83dd.tar.gz
frameworks_base-93fb68fdce8f0d28eaa77704e4b00933260b83dd.tar.bz2
Fix network name not showing in QS sometimes
Only set the network name from service state if we are sure we a value for it. Bug: 22212693 Change-Id: I0811e8fe4682180d9187c42362bc40ab19922f2c
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
index 82224d4..13e9b16 100644
--- 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.SignalStrength;
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 @@ public class MobileSignalController extends SignalController<
}
// 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();
}