From 6be4f6b18dc6e26065874d8de048e3dad1a21b0d Mon Sep 17 00:00:00 2001
From: Sungmin Choi <sungmin.choi@lge.com>
Date: Tue, 7 Jul 2015 13:06:59 +0900
Subject: [PATCH] Fix to work statusbar configs as mcc/mnc

Call handleConfigurationChanged() at the end of
PhoneStatusBar#onConfigurationChanged to update statusbar configs.

BUG: 22215928
Change-Id: I7329d4949a8a47717ea037cf007ef0baa63507bd
---
 .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 1 +
 .../systemui/statusbar/policy/NetworkControllerImpl.java     | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index a637e24ba8bb4..20f4dc7d618d8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2914,6 +2914,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         updateRowStates();
         mIconController.updateResources();
         mScreenPinningRequest.onConfigurationChanged();
+        mNetworkController.handleConfigurationChanged();
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index ff0e8a3f7bedd..24e3c78679f6d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -340,7 +340,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
                 action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {
             updateConnectivity();
         } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {
-            mConfig = Config.readConfig(mContext);
             handleConfigurationChanged();
         } else if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) {
             refreshLocale();
@@ -374,8 +373,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
         }
     }
 
-    @VisibleForTesting
-    void handleConfigurationChanged() {
+    public void handleConfigurationChanged() {
+        mConfig = Config.readConfig(mContext);
         for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) {
             mobileSignalController.setConfiguration(mConfig);
         }