PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename WifiConfiguration.getHasEverConnected()

Browse Source 
Renamed to hasEverConnected() to conform to API
guidelines.

Bug: 146046526
Test: make RunSettingsRoboTests -j40
Change-Id: Ie88945326977ea11a05721e40a81c338fee61cb6
This commit is contained in:
David Su
2020-01-30 17:52:12 -08:00
parent 8ad24a25ad
commit fa6e9f7283
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/WifiSettings2.java
View File

@@ -77,7 +77,6 @@ import com.android.settingslib.search.SearchIndexableRaw;
import com.android.settingslib.wifi.LongPressWifiEntryPreference; import com.android.settingslib.wifi.LongPressWifiEntryPreference;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback; import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback.ConnectStatus;
import com.android.wifitrackerlib.WifiPickerTracker; import com.android.wifitrackerlib.WifiPickerTracker;
import java.time.Clock; import java.time.Clock;
@@ -540,7 +539,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment
if (selectedEntry.isSaved()) { if (selectedEntry.isSaved()) {
if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus() if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus()
.getHasEverConnected()) { .hasEverConnected()) {
launchConfigNewNetworkFragment(selectedEntry); launchConfigNewNetworkFragment(selectedEntry);
return true; return true;
} }

2
src/com/android/settings/wifi/WifiUtils.java
View File

@@ -272,7 +272,7 @@ public class WifiUtils {
return CONNECT_TYPE_OPEN_NETWORK; return CONNECT_TYPE_OPEN_NETWORK;
} else if (accessPoint.isSaved() && config != null } else if (accessPoint.isSaved() && config != null
&& config.getNetworkSelectionStatus() != null && config.getNetworkSelectionStatus() != null
&& config.getNetworkSelectionStatus().getHasEverConnected()) { && config.getNetworkSelectionStatus().hasEverConnected()) {
return CONNECT_TYPE_SAVED_NETWORK; return CONNECT_TYPE_SAVED_NETWORK;
} else if (accessPoint.isPasspoint()) { } else if (accessPoint.isPasspoint()) {
// Access point provided by an installed Passpoint provider, connect using // Access point provided by an installed Passpoint provider, connect using

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

@@ -100,7 +100,7 @@ public class ConnectToWifiHandlerTest {
when(mAccessPoint.isSaved()).thenReturn(true); when(mAccessPoint.isSaved()).thenReturn(true);
when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK); when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class); final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class);
when(status.getHasEverConnected()).thenReturn(true); when(status.hasEverConnected()).thenReturn(true);
when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status); when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status);
mHandler.connect(mContext, mAccessPoint); mHandler.connect(mContext, mAccessPoint);