From 01a400d09a69413444d1003fa1adff91819640df Mon Sep 17 00:00:00 2001 From: David Su Date: Thu, 30 Jan 2020 17:51:52 -0800 Subject: Rename WifiConfiguration.getHasEverConnected() Renamed to hasEverConnected() to conform to API guidelines. Bug: 146046526 Test: atest FrameworksWifiTests Change-Id: Icdc64af7abf7edd57660dab62232c94962e48936 --- .../java/com/android/server/wifi/ClientModeImpl.java | 2 +- .../com/android/server/wifi/WakeupController.java | 2 +- .../android/server/wifi/WifiLastResortWatchdog.java | 4 ++-- .../java/com/android/server/wifi/WifiMetrics.java | 2 +- .../java/com/android/server/wifi/util/XmlUtil.java | 2 +- .../android/server/wifi/WifiConfigManagerTest.java | 8 ++++---- .../server/wifi/WifiConfigurationTestUtil.java | 2 +- .../server/wifi/WifiLastResortWatchdogTest.java | 20 ++++++++++---------- .../src/com/android/server/wifi/WifiMetricsTest.java | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index f35862da1..d50572e06 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -3032,7 +3032,7 @@ public class ClientModeImpl extends StateMachine { return false; } WifiConfiguration network = mWifiConfigManager.getConfiguredNetwork(networkId); - if (network != null && network.getNetworkSelectionStatus().getHasEverConnected()) { + if (network != null && network.getNetworkSelectionStatus().hasEverConnected()) { return false; } return true; diff --git a/service/java/com/android/server/wifi/WakeupController.java b/service/java/com/android/server/wifi/WakeupController.java index a5a643ecb..f5dabf35c 100644 --- a/service/java/com/android/server/wifi/WakeupController.java +++ b/service/java/com/android/server/wifi/WakeupController.java @@ -323,7 +323,7 @@ public class WakeupController { if (isWideAreaNetwork(config) || config.hasNoInternetAccess() || config.noInternetAccessExpected - || !config.getNetworkSelectionStatus().getHasEverConnected()) { + || !config.getNetworkSelectionStatus().hasEverConnected()) { continue; } goodNetworks.add(ScanResultMatchInfo.fromWifiConfiguration(config)); diff --git a/service/java/com/android/server/wifi/WifiLastResortWatchdog.java b/service/java/com/android/server/wifi/WifiLastResortWatchdog.java index 0858f03c6..9846747f6 100644 --- a/service/java/com/android/server/wifi/WifiLastResortWatchdog.java +++ b/service/java/com/android/server/wifi/WifiLastResortWatchdog.java @@ -546,7 +546,7 @@ public class WifiLastResortWatchdog { for (Map.Entry entry : mRecentAvailableNetworks.entrySet()) { if (entry.getValue().config != null - && entry.getValue().config.getNetworkSelectionStatus().getHasEverConnected()) { + && entry.getValue().config.getNetworkSelectionStatus().hasEverConnected()) { return true; } } @@ -791,7 +791,7 @@ public class WifiLastResortWatchdog { public String toString() { return ssid + " HasEverConnected: " + ((config != null) - ? config.getNetworkSelectionStatus().getHasEverConnected() : "null_config") + ? config.getNetworkSelectionStatus().hasEverConnected() : "null_config") + ", Failures: {" + "Assoc: " + associationRejection + ", Auth: " + authenticationFailure diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java index 4dfa7035a..4873c7028 100644 --- a/service/java/com/android/server/wifi/WifiMetrics.java +++ b/service/java/com/android/server/wifi/WifiMetrics.java @@ -3763,7 +3763,7 @@ public class WifiMetrics { info.hiddenSsid = config.hiddenSSID; info.isPasspoint = config.isPasspoint(); info.isEphemeral = config.isEphemeral(); - info.hasEverConnected = config.getNetworkSelectionStatus().getHasEverConnected(); + info.hasEverConnected = config.getNetworkSelectionStatus().hasEverConnected(); ScanResult candidate = config.getNetworkSelectionStatus().getCandidate(); if (candidate != null) { info.scanRssi = candidate.level; diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java index 414916e49..2f7b31f61 100644 --- a/service/java/com/android/server/wifi/util/XmlUtil.java +++ b/service/java/com/android/server/wifi/util/XmlUtil.java @@ -1015,7 +1015,7 @@ public class XmlUtil { out, XML_TAG_DISABLE_REASON, selectionStatus.getNetworkDisableReasonString()); XmlUtil.writeNextValue(out, XML_TAG_CONNECT_CHOICE, selectionStatus.getConnectChoice()); XmlUtil.writeNextValue( - out, XML_TAG_HAS_EVER_CONNECTED, selectionStatus.getHasEverConnected()); + out, XML_TAG_HAS_EVER_CONNECTED, selectionStatus.hasEverConnected()); } /** diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 5535ffbb1..95b8adedb 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -1993,7 +1993,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { WifiConfiguration retrievedNetwork = mWifiConfigManager.getConfiguredNetwork(result.getNetworkId()); assertFalse("Updating network credentials config must clear hasEverConnected.", - retrievedNetwork.getNetworkSelectionStatus().getHasEverConnected()); + retrievedNetwork.getNetworkSelectionStatus().hasEverConnected()); assertTrue(result.hasCredentialChanged()); } @@ -5675,7 +5675,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { WifiConfiguration retrievedNetwork = mWifiConfigManager.getConfiguredNetwork(result.getNetworkId()); assertFalse("Adding a new network should not have hasEverConnected set to true.", - retrievedNetwork.getNetworkSelectionStatus().getHasEverConnected()); + retrievedNetwork.getNetworkSelectionStatus().hasEverConnected()); } /** @@ -5688,7 +5688,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { WifiConfiguration retrievedNetwork = mWifiConfigManager.getConfiguredNetwork(result.getNetworkId()); assertFalse("Updating network credentials config should clear hasEverConnected.", - retrievedNetwork.getNetworkSelectionStatus().getHasEverConnected()); + retrievedNetwork.getNetworkSelectionStatus().hasEverConnected()); assertTrue(result.hasCredentialChanged()); } @@ -5701,7 +5701,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { assertTrue(mWifiConfigManager.updateNetworkAfterConnect(networkId)); WifiConfiguration retrievedNetwork = mWifiConfigManager.getConfiguredNetwork(networkId); assertTrue("hasEverConnected expected to be true after connection.", - retrievedNetwork.getNetworkSelectionStatus().getHasEverConnected()); + retrievedNetwork.getNetworkSelectionStatus().hasEverConnected()); } /** diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java index b748fe6bc..fa6f450f3 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java @@ -730,7 +730,7 @@ public class WifiConfigurationTestUtil { actual.getNetworkSelectionDisableReason()); } assertEquals(expected.getConnectChoice(), actual.getConnectChoice()); - assertEquals(expected.getHasEverConnected(), actual.getHasEverConnected()); + assertEquals(expected.hasEverConnected(), actual.hasEverConnected()); } /** diff --git a/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java b/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java index bf4976475..b463f906d 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java @@ -110,7 +110,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { WifiConfiguration.NetworkSelectionStatus networkSelectionStatus = mock(WifiConfiguration.NetworkSelectionStatus.class); when(config.getNetworkSelectionStatus()).thenReturn(networkSelectionStatus); - when(networkSelectionStatus.getHasEverConnected()).thenReturn(true); + when(networkSelectionStatus.hasEverConnected()).thenReturn(true); } candidates.add(Pair.create(scanDetail, config)); } @@ -134,7 +134,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { WifiConfiguration.NetworkSelectionStatus networkSelectionStatus = mock(WifiConfiguration.NetworkSelectionStatus.class); when(config.getNetworkSelectionStatus()).thenReturn(networkSelectionStatus); - when(networkSelectionStatus.getHasEverConnected()) + when(networkSelectionStatus.hasEverConnected()) .thenReturn(hasEverConnected[index]); } candidates.add(Pair.create(scanDetail, config)); @@ -1619,7 +1619,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { WifiConfiguration.NetworkSelectionStatus networkSelectionStatus = mock(WifiConfiguration.NetworkSelectionStatus.class); when(config.getNetworkSelectionStatus()).thenReturn(networkSelectionStatus); - when(networkSelectionStatus.getHasEverConnected()) + when(networkSelectionStatus.hasEverConnected()) .thenReturn(true); candidates.add(Pair.create(scanDetail, config)); mLastResortWatchdog.updateAvailableNetworks(candidates); @@ -1656,7 +1656,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { mock(WifiConfiguration.NetworkSelectionStatus.class); when(configHasEverConnectedFalse.getNetworkSelectionStatus()) .thenReturn(networkSelectionStatusFalse); - when(networkSelectionStatusFalse.getHasEverConnected()) + when(networkSelectionStatusFalse.hasEverConnected()) .thenReturn(false); candidates.add(Pair.create(scanDetail, configHasEverConnectedFalse)); mLastResortWatchdog.updateAvailableNetworks(candidates); @@ -1675,7 +1675,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { mock(WifiConfiguration.NetworkSelectionStatus.class); when(configHasEverConnectedTrue.getNetworkSelectionStatus()) .thenReturn(networkSelectionStatusTrue); - when(networkSelectionStatusTrue.getHasEverConnected()) + when(networkSelectionStatusTrue.hasEverConnected()) .thenReturn(true); candidates.add(Pair.create(scanDetail, configHasEverConnectedTrue)); mLastResortWatchdog.updateAvailableNetworks(candidates); @@ -1704,7 +1704,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { mock(WifiConfiguration.NetworkSelectionStatus.class); when(configHasEverConnectedTrue.getNetworkSelectionStatus()) .thenReturn(networkSelectionStatusTrue); - when(networkSelectionStatusTrue.getHasEverConnected()) + when(networkSelectionStatusTrue.hasEverConnected()) .thenReturn(true); candidates.add(Pair.create(scanDetail, configHasEverConnectedTrue)); mLastResortWatchdog.updateAvailableNetworks(candidates); @@ -1723,7 +1723,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { mock(WifiConfiguration.NetworkSelectionStatus.class); when(configHasEverConnectedFalse.getNetworkSelectionStatus()) .thenReturn(networkSelectionStatusFalse); - when(networkSelectionStatusFalse.getHasEverConnected()) + when(networkSelectionStatusFalse.hasEverConnected()) .thenReturn(false); candidates.add(Pair.create(scanDetail, configHasEverConnectedFalse)); mLastResortWatchdog.updateAvailableNetworks(candidates); @@ -1750,7 +1750,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { mock(WifiConfiguration.NetworkSelectionStatus.class); when(configHasEverConnectedTrue.getNetworkSelectionStatus()) .thenReturn(networkSelectionStatusTrue); - when(networkSelectionStatusTrue.getHasEverConnected()).thenReturn(true); + when(networkSelectionStatusTrue.hasEverConnected()).thenReturn(true); WifiLastResortWatchdog.AvailableNetworkFailureCount withConfigHECTrue = new WifiLastResortWatchdog.AvailableNetworkFailureCount(configHasEverConnectedTrue); String output = withConfigHECTrue.toString(); @@ -1762,7 +1762,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { mock(WifiConfiguration.NetworkSelectionStatus.class); when(configHasEverConnectedFalse.getNetworkSelectionStatus()) .thenReturn(networkSelectionStatusFalse); - when(networkSelectionStatusFalse.getHasEverConnected()).thenReturn(false); + when(networkSelectionStatusFalse.hasEverConnected()).thenReturn(false); WifiLastResortWatchdog.AvailableNetworkFailureCount withConfigHECFalse = new WifiLastResortWatchdog.AvailableNetworkFailureCount( configHasEverConnectedFalse); @@ -1925,7 +1925,7 @@ public class WifiLastResortWatchdogTest extends WifiBaseTest { verify(mWifiMetrics, times(1)).incrementNumLastResortWatchdogTriggers(); // Simulate user changing the configuration - when(candidates.get(0).second.getNetworkSelectionStatus().getHasEverConnected()) + when(candidates.get(0).second.getNetworkSelectionStatus().hasEverConnected()) .thenReturn(false); mLastResortWatchdog.connectedStateTransition(true); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java index dabc3c001..69002aaab 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java @@ -2395,7 +2395,7 @@ public class WifiMetricsTest extends WifiBaseTest { assertEquals(config.allowedGroupCiphers, intToBitSet(info.allowedGroupCiphers)); assertEquals(config.hiddenSSID, info.hiddenSsid); assertEquals(config.ephemeral, info.isEphemeral); - assertEquals(config.getNetworkSelectionStatus().getHasEverConnected(), + assertEquals(config.getNetworkSelectionStatus().hasEverConnected(), info.hasEverConnected); assertEquals(config.getNetworkSelectionStatus().getCandidate().level, info.scanRssi); assertEquals(config.getNetworkSelectionStatus().getCandidate().frequency, info.scanFreq); -- cgit v1.2.3