| commit | 5c4a0e3444124f98a0f1a0b023e93ff94654c4c8 | [log] [tgz] |
|---|---|---|
| author | Quang Luong <qal@google.com> | Tue Jul 30 17:16:00 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 17:16:00 2019 -0700 |
| tree | 11e96db4ff5d8a13986c7757665509cd9145dc65 | |
| parent | 5a39d48ab222696502b38e850d0f18b0a7080b60 [diff] | |
| parent | 17908b1e8f18849ea5e0a29e20c8acf4f8386ec9 [diff] |
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f Change-Id: Ie1cdb83f47bac988b93401b3994a096d85333ce6
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";