summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-08-10 10:12:02 -0400
committerJason Monk <jmonk@google.com>2015-08-10 10:29:47 -0400
commit00aa9d4427cd6ca00edcbc1b7915bc22ac580d6a (patch)
tree9a07026efdb71549f13b9fcffd9a54e10b46adc4 /packages/SystemUI/src/com/android/systemui/statusbar
parent90b030bae8cc1f13da7948fef4aff1d171a2885a (diff)
downloadframeworks_base-00aa9d4427cd6ca00edcbc1b7915bc22ac580d6a.zip
frameworks_base-00aa9d4427cd6ca00edcbc1b7915bc22ac580d6a.tar.gz
frameworks_base-00aa9d4427cd6ca00edcbc1b7915bc22ac580d6a.tar.bz2
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
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java6
1 files 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 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 @@ 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.