Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97517309 authored by David Su's avatar David Su
Browse files

SettingsLib: Rename WifiManager.LINK_CONFIGURATION_CHANGED_ACTION 

Rename WifiManager.LINK_CONFIGURATION_CHANGED_ACTION
to WifiManager.ACTION_LINK_CONFIGURATION_CHANGED
to conform to API guidelines.

Bug: 143970861
Test: make RunSettingsLibRoboTests -j40
Change-Id: Ib2ad30259276405586000d0d34322d5fa5e25a84
parent 307bf56e

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public abstract class AbstractImsStatusPreferenceController 
    private static final String[] CONNECTIVITY_INTENTS = {

            BluetoothAdapter.ACTION_STATE_CHANGED,

            ConnectivityManager.CONNECTIVITY_ACTION,

            WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,

            WifiManager.ACTION_LINK_CONFIGURATION_CHANGED,

            WifiManager.NETWORK_STATE_CHANGED_ACTION,

    };

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public abstract class AbstractIpAddressPreferenceController 


    private static final String[] CONNECTIVITY_INTENTS = {

            ConnectivityManager.CONNECTIVITY_ACTION,

            WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,

            WifiManager.ACTION_LINK_CONFIGURATION_CHANGED,

            WifiManager.NETWORK_STATE_CHANGED_ACTION,

    };

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public abstract class AbstractWifiMacAddressPreferenceController 


    private static final String[] CONNECTIVITY_INTENTS = {

            ConnectivityManager.CONNECTIVITY_ACTION,

            WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,

            WifiManager.ACTION_LINK_CONFIGURATION_CHANGED,

            WifiManager.NETWORK_STATE_CHANGED_ACTION,

    };

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
        filter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);

        filter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);

        filter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);

        filter.addAction(WifiManager.ACTION_LINK_CONFIGURATION_CHANGED);

        filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        filter.addAction(WifiManager.RSSI_CHANGED_ACTION);
@@ -866,7 +866,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 


                fetchScansAndConfigsAndUpdateAccessPoints();

            } else if (WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION.equals(action)

                    || WifiManager.LINK_CONFIGURATION_CHANGED_ACTION.equals(action)) {

                    || WifiManager.ACTION_LINK_CONFIGURATION_CHANGED.equals(action)) {

                fetchScansAndConfigsAndUpdateAccessPoints();

            } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {

                // TODO(sghuman): Refactor these methods so they cannot result in duplicate

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ public class WifiTrackerTest { 
        tracker.mReceiver.onReceive(

                mContext, new Intent(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION));

        tracker.mReceiver.onReceive(

                mContext, new Intent(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION));

                mContext, new Intent(WifiManager.ACTION_LINK_CONFIGURATION_CHANGED));





        verify(mockWifiListener, never()).onAccessPointsChanged();
@@ -920,7 +920,7 @@ public class WifiTrackerTest { 
        tracker.mReceiver.onReceive(

                mContext, new Intent(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION));

        tracker.mReceiver.onReceive(

                mContext, new Intent(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION));

                mContext, new Intent(WifiManager.ACTION_LINK_CONFIGURATION_CHANGED));



        verify(mockWifiListener, never()).onAccessPointsChanged();