am 6c9001fc: am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev

* commit '6c9001fc28ea0abbfe95ef7aec1cdcd7192cd963':
  Fix network name not showing in QS sometimes
This commit is contained in:
Jason Monk
2015-07-28 19:06:23 +00:00
committed by Android Git Automerger

View File

@@ -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();
}