commit a5c0c209c501793c80e9197d89e71123572ac2f8
author Jason Monk <jmonk@google.com> Mon Aug 10 14:56:52 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 10 14:56:52 2015 +0000
tree bc417b1b6abacd89e3b7973e1e741476101aa378
parent e6639066bd3adbc803a6fe1ba49c8331a80ee478
parent 4218e46a3263e5ed9d99e600ef9b30cbd24cc861

am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev

* commit '4218e46a3263e5ed9d99e600ef9b30cbd24cc861':
  Initialize network name better in NetworkController

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

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 ed1dca3..b65bf43 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -88,8 +88,10 @@
 
         mapIconSets();
 
-        mLastState.networkName = mCurrentState.networkName = mNetworkNameDefault;
-        mLastState.networkNameData = mCurrentState.networkNameData = mNetworkNameDefault;
+        String networkName = info.getCarrierName() != null ? info.getCarrierName().toString()
+                : mNetworkNameDefault;
+        mLastState.networkName = mCurrentState.networkName = networkName;
+        mLastState.networkNameData = mCurrentState.networkNameData = networkName;
         mLastState.enabled = mCurrentState.enabled = hasMobileData;
         mLastState.iconGroup = mCurrentState.iconGroup = mDefaultIcons;
         // Get initial data sim state.