From 68913c5a8beac79647154fde9805801cfa76b41f Mon Sep 17 00:00:00 2001 From: David Su Date: Thu, 30 Jan 2020 20:29:24 -0800 Subject: [PATCH] Migrate to getNetworkSelectionStatus() isNetworkEnabled() & isNetworkPermanentlyDisabled() should not be formal APIs. Instead, getNetworkSelectionStatus() with a set of constants is sufficient as an API surface, and will be more maintainable in the future. Bug: 146046526 Test: atest SettingsUnitTests Change-Id: If599ce88f68a87fa7186ef96156c2bb1fdc1c2c3 --- src/com/android/settings/wifi/WifiSettings.java | 4 +++- src/com/android/settings/wifi/WifiSettings2.java | 4 +++- .../src/com/android/settings/wifi/WifiSettingsUiTest.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 488aadbafb7..00df0512372 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -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(); diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index 225e68cbfd6..72f299ca7e3 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -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(); diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java index 4ebfef77131..bc8a52a148b 100644 --- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java +++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java @@ -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);