Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9dc0cc00: am f18ed45f: Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev

Browse Source 
* commit '9dc0cc00563aaa0890d2b8494bfd4c475098417d':
  Fix to work statusbar configs as mcc/mnc
This commit is contained in:
Jason Monk
2015-07-07 16:07:16 +00:00
committed by Android Git Automerger
parent 8e5d47610a 9dc0cc0056
commit 63138aedc7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2914,6 +2914,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
updateRowStates(); updateRowStates();
mIconController.updateResources(); mIconController.updateResources();
mScreenPinningRequest.onConfigurationChanged(); mScreenPinningRequest.onConfigurationChanged();
mNetworkController.handleConfigurationChanged();
} }
@Override @Override

5
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -340,7 +340,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
action.equals(ConnectivityManager.INET_CONDITION_ACTION)) { action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {
updateConnectivity(); updateConnectivity();
} else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) { } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {
mConfig = Config.readConfig(mContext);
handleConfigurationChanged(); handleConfigurationChanged();
} else if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) { } else if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) {
refreshLocale(); refreshLocale();
@@ -374,8 +373,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
} }
} }
@VisibleForTesting public void handleConfigurationChanged() {
void handleConfigurationChanged() { mConfig = Config.readConfig(mContext);
for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) { for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) {
mobileSignalController.setConfiguration(mConfig); mobileSignalController.setConfiguration(mConfig);
} }