| commit | a5c8edb46f0656ab420f9343b6fe34c1a34f90ab | [log] [tgz] |
|---|---|---|
| author | Quang Luong <qal@google.com> | Tue Jul 30 17:37:41 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 17:37:41 2019 -0700 |
| tree | 9d70b464ff6aab2c1844647519995f2931f66049 | |
| parent | 2027cdd830c122e707116abb1f285d8e5abf0272 [diff] | |
| parent | b66a8c86a4b3f0a97a1ba4efeeb5741fe9bebfc8 [diff] |
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f am: 5c4a0e3444 am: b66a8c86a4 Change-Id: I2cfd0376d60efcc5fd417139bfcb3446a2485871
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index 5e49b2e..a915766 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -682,7 +682,11 @@ } 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 9a1dd4c..010fb74 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 @@ 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";