diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-28 18:05:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 18:05:49 +0000 |
| commit | 350662197542d406df58aa65afddc9e23f9309d3 (patch) | |
| tree | 9fdc9a92ecff673b1ecdc7c970ce8c5b5a81b6d0 /packages | |
| parent | 602611375b11805f74ae52f5d62a944c74f967d6 (diff) | |
| parent | 93fb68fdce8f0d28eaa77704e4b00933260b83dd (diff) | |
| download | frameworks_base-350662197542d406df58aa65afddc9e23f9309d3.zip frameworks_base-350662197542d406df58aa65afddc9e23f9309d3.tar.gz frameworks_base-350662197542d406df58aa65afddc9e23f9309d3.tar.bz2 | |
Merge "Fix network name not showing in QS sometimes" into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java | 3 |
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(); } |