From fa6e9f728372f7c7bf11e1cc90ba46e11928de64 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Thu, 30 Jan 2020 17:52:12 -0800
Subject: [PATCH] Rename WifiConfiguration.getHasEverConnected()

Renamed to hasEverConnected() to conform to API
guidelines.

Bug: 146046526
Test: make RunSettingsRoboTests -j40
Change-Id: Ie88945326977ea11a05721e40a81c338fee61cb6
---
 src/com/android/settings/wifi/WifiSettings2.java               | 3 +--
 src/com/android/settings/wifi/WifiUtils.java                   | 2 +-
 .../android/settings/wifi/slice/ConnectToWifiHandlerTest.java  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index c48e7393d9a..225e68cbfd6 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -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;
                 }
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index 9b3c1b368c9..4faf11f1f9d 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -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
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
index 195bafc3ff0..ac1384f8756 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
@@ -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);