commit fcb34b419d816202a48760bfc21e0c67836601e7
author Jason Monk <jmonk@google.com> Mon Aug 10 15:10:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 10 15:10:29 2015 +0000
tree 6de9a3e4b5340da53c32ec08ffd5c9ed0821a0fc
parent fc284814dd6d9323c2628d6936db45351533f1e3
parent 850e5ee16353cfcde553fe5d86c50f508a82c44a

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

* commit '850e5ee16353cfcde553fe5d86c50f508a82c44a':
  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.