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

Commit 688cc24c authored by Xi Han's avatar Xi Han Committed by Automerger Merge Worker
Browse files

Merge "Display W+ icon following carrier config" into sc-qpr1-dev am: 98de9300 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600954

Change-Id: If5a5eef83480948a57236d50fd00b229b204e2a1
parents b3236d49 98de9300

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

+4 −10
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public class WifiStatusTracker { 
    private Network mDefaultNetwork = null;

    private NetworkCapabilities mDefaultNetworkCapabilities = null;

    private final Runnable mCallback;

    private final boolean mSupportMergedUi;



    private WifiInfo mWifiInfo;

    public boolean enabled;
@@ -181,7 +180,6 @@ public class WifiStatusTracker { 
        mNetworkScoreManager = networkScoreManager;

        mConnectivityManager = connectivityManager;

        mCallback = callback;

        mSupportMergedUi = false;

    }



    public void setListening(boolean listening) {
@@ -223,10 +221,8 @@ public class WifiStatusTracker { 
                } else {

                    ssid = getValidSsid(mWifiInfo);

                }

                if (mSupportMergedUi) {

                isCarrierMerged = mWifiInfo.isCarrierMerged();

                subId = mWifiInfo.getSubscriptionId();

                }

                updateRssi(mWifiInfo.getRssi());

                maybeRequestNetworkScore();

            }
@@ -255,10 +251,8 @@ public class WifiStatusTracker { 
            } else {

                ssid = getValidSsid(mWifiInfo);

            }

            if (mSupportMergedUi) {

            isCarrierMerged = mWifiInfo.isCarrierMerged();

            subId = mWifiInfo.getSubscriptionId();

            }

            updateRssi(mWifiInfo.getRssi());

            maybeRequestNetworkScore();

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java

+3 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { 
        mNetworkController.setNoNetworksAvailable(false);

        setWifiStateForVcn(true, testSsid);

        setWifiLevelForVcn(0);

        verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][0]);

        verifyLastMobileDataIndicatorsForVcn(true, 0, TelephonyIcons.ICON_CWF, false);



        mNetworkController.setNoNetworksAvailable(true);

        for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) {
@@ -246,11 +246,11 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { 


            setConnectivityViaCallbackInNetworkControllerForVcn(

                    NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo);

            verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]);

            verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, true);



            setConnectivityViaCallbackInNetworkControllerForVcn(

                    NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo);

            verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]);

            verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, false);

        }

    }