Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev

This commit is contained in:
Jason Monk
2015-07-07 14:34:45 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

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

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);
} }