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

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

Merge "Rename WifiConfiguration.getHasEverConnected()"

parents 7e7b59e4 fa6e9f72

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

+1 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import com.android.settingslib.search.SearchIndexableRaw; 
import com.android.settingslib.wifi.LongPressWifiEntryPreference;

import com.android.wifitrackerlib.WifiEntry;

import com.android.wifitrackerlib.WifiEntry.ConnectCallback;

import com.android.wifitrackerlib.WifiEntry.ConnectCallback.ConnectStatus;

import com.android.wifitrackerlib.WifiPickerTracker;



import java.time.Clock;
@@ -540,7 +539,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment 


            if (selectedEntry.isSaved()) {

                if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus()

                        .getHasEverConnected()) {

                        .hasEverConnected()) {

                    launchConfigNewNetworkFragment(selectedEntry);

                    return true;

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public class WifiUtils { 
            return CONNECT_TYPE_OPEN_NETWORK;

        } else if (accessPoint.isSaved() && config != null

                && config.getNetworkSelectionStatus() != null

                && config.getNetworkSelectionStatus().getHasEverConnected()) {

                && config.getNetworkSelectionStatus().hasEverConnected()) {

            return CONNECT_TYPE_SAVED_NETWORK;

        } else if (accessPoint.isPasspoint()) {

            // Access point provided by an installed Passpoint provider, connect using

tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class ConnectToWifiHandlerTest { 
        when(mAccessPoint.isSaved()).thenReturn(true);

        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);

        final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class);

        when(status.getHasEverConnected()).thenReturn(true);

        when(status.hasEverConnected()).thenReturn(true);

        when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status);



        mHandler.connect(mContext, mAccessPoint);