commit 31b0da66a6db1384b0e0d80cba2595f5653b2c97
author Paul Stewart <pstew@google.com> Fri Oct 28 21:20:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 28 21:20:19 2016 +0000
tree 2a28cfea32b9a0f4bcf1fe08fbca96d9796ad559
parent 0cbb338ecc64cfd28421755c23cfd95ba12ef6fd
parent 09797c330c0f5f0f88b16cc01f95ae9c7e8e1d8b

Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968 am: dab924f04d
am: 09797c330c

Change-Id: I12cc021a1abead960ec28354e9d6e94ea8090c88

src/com/android/settings/deviceinfo/Status.java

diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 14173e8..1cbc78c 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -280,7 +280,8 @@
 
     private void setWifiStatus() {
         WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-        String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
+        boolean hasMacAddress = wifiInfo != null && wifiInfo.hasRealMacAddress();
+        String macAddress = hasMacAddress ? wifiInfo.getMacAddress() : null;
         mWifiMacAddress.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress : mUnavailable);
     }