From 40f9d90bc607194ab0bd05b2442deb30b7b36fb8 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Tue, 26 Jul 2022 21:10:38 +0000 Subject: [PATCH] Revert "[Cleanup] Order NetworkController's intent filters" Revert submission 19279477 Reason for revert: b/240223150 Reverted Changes: I1bef3f309:Remove support for COMBINED_SIGNAL_ICONS I38f76a746:Create a MobileStatusTrackerFactory I0b1dd8e71:Change from deprecated telephony api Id1a02134f:[Cleanup] Order NetworkController's intent filters... I405ad3858:Add an @Inject-able MobileSignalControllerFactory Change-Id: Id6b03a4423b6b34f469cc6d749b0433e35e8b281 --- .../connectivity/NetworkControllerImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java index 6be347b55bc51..8a84ba12fa1cc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java @@ -503,16 +503,16 @@ public class NetworkControllerImpl extends BroadcastReceiver // broadcasts IntentFilter filter = new IntentFilter(); - filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED); - filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); - filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); - filter.addAction(Intent.ACTION_SERVICE_STATE); + filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); filter.addAction(Intent.ACTION_SIM_STATE_CHANGED); - filter.addAction(Settings.Panel.ACTION_INTERNET_CONNECTIVITY); filter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED); filter.addAction(TelephonyManager.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED); + filter.addAction(Intent.ACTION_SERVICE_STATE); filter.addAction(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED); - filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); + filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); + filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); + filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED); + filter.addAction(Settings.Panel.ACTION_INTERNET_CONNECTIVITY); mBroadcastDispatcher.registerReceiverWithHandler(this, filter, mReceiverHandler); mListening = true;