Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev

am: 17908b1e8f Change-Id: I52e92aeffd349ed17f832b34b352f28a6c575ccb
2019-07-30 17:10:59 -07:00
parent d188932f64 17908b1e8f
commit 877d4d6d0a
2 changed files with 6 additions and 2 deletions
--- 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() {