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

Commit 2ad3a3e0 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Migrate to getNetworkSelectionStatus()"

parents 0c277e44 68913c5a

src/com/android/settings/wifi/WifiSettings.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.wifi;



import static android.net.NetworkCapabilities.TRANSPORT_WIFI;

import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;

import static android.os.UserManager.DISALLOW_CONFIG_WIFI;



import android.annotation.NonNull;
@@ -730,7 +731,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
        }

        WifiConfiguration.NetworkSelectionStatus networkStatus =

                config.getNetworkSelectionStatus();

        if (networkStatus == null || networkStatus.isNetworkEnabled()) {

        if (networkStatus == null

                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {

            return false;

        }

        int reason = networkStatus.getNetworkSelectionDisableReason();

src/com/android/settings/wifi/WifiSettings2.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.wifi;



import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;

import static android.os.UserManager.DISALLOW_CONFIG_WIFI;



import android.app.Activity;
@@ -1100,7 +1101,8 @@ public class WifiSettings2 extends RestrictedSettingsFragment 
        }

        WifiConfiguration.NetworkSelectionStatus networkStatus =

                config.getNetworkSelectionStatus();

        if (networkStatus == null || networkStatus.isNetworkEnabled()) {

        if (networkStatus == null

                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {

            return false;

        }

        int reason = networkStatus.getNetworkSelectionDisableReason();

tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

+2 −1
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ public class WifiSettingsUiTest { 
        assertThat(accessPoint.getConfig()).isNotNull();

        NetworkSelectionStatus networkStatus = accessPoint.getConfig().getNetworkSelectionStatus();

        assertThat(networkStatus).isNotNull();

        assertThat(networkStatus.isNetworkEnabled()).isFalse();

        assertThat(networkStatus.getNetworkSelectionStatus())

                .isEqualTo(NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED);

        assertThat(networkStatus.getNetworkSelectionDisableReason()).isEqualTo(

                NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);