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

Commit b501817e authored by Ying Xu's avatar Ying Xu Committed by Automerger Merge Worker
Browse files

Merge "Disable W+ in QS." into sc-dev am: d003be93 

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

Change-Id: I07f2e5d7bfdb46bb9f21397276f0240183c4dd7c
parents 1943d7c2 d003be93

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

+4 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.net.wifi.WifiNetworkScoreCache; 
import android.os.Handler;

import android.os.Looper;

import android.provider.Settings;

import android.util.FeatureFlagUtils;



import com.android.settingslib.R;

import com.android.settingslib.Utils;
@@ -158,7 +157,7 @@ public class WifiStatusTracker { 
    private Network mDefaultNetwork = null;

    private NetworkCapabilities mDefaultNetworkCapabilities = null;

    private final Runnable mCallback;

    private final boolean mProviderModel;

    private final boolean mSupportMergedUi;



    private WifiInfo mWifiInfo;

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

        mConnectivityManager = connectivityManager;

        mCallback = callback;

        mProviderModel = FeatureFlagUtils.isEnabled(

                mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);

        mSupportMergedUi = false;

    }



    public void setListening(boolean listening) {
@@ -225,7 +223,7 @@ public class WifiStatusTracker { 
                } else {

                    ssid = getValidSsid(mWifiInfo);

                }

                if (mProviderModel) {

                if (mSupportMergedUi) {

                    isCarrierMerged = mWifiInfo.isCarrierMerged();

                    subId = mWifiInfo.getSubscriptionId();

                }
@@ -257,7 +255,7 @@ public class WifiStatusTracker { 
            } else {

                ssid = getValidSsid(mWifiInfo);

            }

            if (mProviderModel) {

            if (mSupportMergedUi) {

                isCarrierMerged = mWifiInfo.isCarrierMerged();

                subId = mWifiInfo.getSubscriptionId();

            }

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

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

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



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

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

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



            setConnectivityViaCallbackInNetworkControllerForVcn(

                    NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo);

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

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

        }

    }