From bbc1cd87e13b52d83b039c508f5e341504e4d8dd Mon Sep 17 00:00:00 2001 From: Tomoharu Hatano Date: Mon, 28 Jun 2021 16:17:28 +0900 Subject: [PATCH] Show "Unavailable" when factory Wi-Fi MAC address is default Show "Unavailable" when factory Wi-Fi MAC address is default to align with WifiDetailPreferenceController. Bug: 192935640 Test: build Change-Id: I38728410b11c0db1d922f29fc68fec6af75affe4 --- .../deviceinfo/AbstractWifiMacAddressPreferenceController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java index b5f275b463f42..b7549ec060efc 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settingslib.deviceinfo; import android.annotation.SuppressLint; import android.content.Context; import android.net.ConnectivityManager; +import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.text.TextUtils; @@ -89,7 +90,7 @@ public abstract class AbstractWifiMacAddressPreferenceController macAddress = macAddresses[0]; } - if (TextUtils.isEmpty(macAddress)) { + if (TextUtils.isEmpty(macAddress) || macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) { mWifiMacAddress.setSummary(R.string.status_unavailable); } else { mWifiMacAddress.setSummary(macAddress);