1 files changed, 6 insertions, 2 deletions
diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
index 0c69ecddd..8ad1f25bf 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
@@ -239,8 +239,7 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
         if (ap != null) {
             WifiConfiguration wifiConfig = ap.getConfig();
             if (wifiConfig != null
-                    && wifiConfig.macRandomizationSetting
-                            == WifiConfiguration.RANDOMIZATION_PERSISTENT) {
+                    && isWifiMacAddressRandomized(ap)) {
                 return wifiConfig.getRandomizedMacAddress().toString();
             }
         }
@@ -268,6 +267,11 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
         return ap.getConfig().macRandomizationSetting;
     }
 
+    /** Return whether the randomized MAC address is used. */
+    public boolean isWifiMacAddressRandomized(AccessPoint ap) {
+        return getWifiMacRandomizationSetting(ap) != WifiConfiguration.RANDOMIZATION_NONE;
+    }
+
     /** Apply the setting of whether to use MAC address randimization. */
     public void applyMacRandomizationSetting(AccessPoint ap, boolean enable) {
         if (ap != null && ap.getConfig() != null) {