From f73d65c940e97b96dd8c572dc63e9df02a834b5d Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Fri, 19 Jul 2019 11:28:03 -0700 Subject: [PATCH] Default MAC address should display "Not Available" in network details For saved networks that do not have a MAC address available in their WifiConfiguration such as Passpoint networks, the MAC address will be the default value of 20:00:00:00:00:00. In this case, display "Not Available" as the summary of the MAC address preference. Bug: 137282522 Test: atest WifiDetailPreferenceControllerTest && manual - open saved passpoint network details while disconnected but in range and observe MAC address preference. Change-Id: Ie9010b0430726de8105852ae2afe10047dcc3676 --- .../wifi/details/WifiDetailPreferenceController.java | 6 +++++- .../wifi/details/WifiDetailPreferenceControllerTest.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 5e49b2e7498..a915766bbe6 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -682,7 +682,11 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController } mMacAddressPref.setVisible(true); - mMacAddressPref.setSummary(macAddress); + if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) { + mMacAddressPref.setSummary(R.string.device_info_not_available); + } else { + mMacAddressPref.setSummary(macAddress); + } } private String getMacAddress() { diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 9a1dd4c0f82..010fb749f74 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -114,7 +114,7 @@ public class WifiDetailPreferenceControllerTest { private static final int TX_LINK_SPEED = 123; private static final int RX_LINK_SPEED = 54; private static final String SSID = "ssid"; - private static final String MAC_ADDRESS = WifiInfo.DEFAULT_MAC_ADDRESS; + private static final String MAC_ADDRESS = "01:23:45:67:89:ab"; private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS"; private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS"; private static final String SECURITY = "None";