From 00aa9d4427cd6ca00edcbc1b7915bc22ac580d6a Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 10 Aug 2015 10:12:02 -0400 Subject: Initialize network name better in NetworkController Initialize current network name to correct value from the SubscriptionInfo until we get a broadcast about its current state. Bug: 22212693 Change-Id: I17fa4378cc7a540c81268f8c4d5aa6a505f3ee40 --- .../android/systemui/statusbar/policy/MobileSignalController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 ed1dca38780f..b65bf43314f4 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 @@ public class MobileSignalController extends SignalController< 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. -- cgit v1.2.3-59-g8ed1b