commit 917b7b863c6eefe5dcaa8523276fb1e7d9e29723
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 28 20:56:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 28 20:56:35 2016 +0000
tree debea404fe1cb6446de3d1caeca1a33bad94dc64
parent de037d5491ca5b553f53b18c657b83abceab131c
parent 1aeb383d731950bf1229abab1600aba8e71b2613

Merge "Don't display an invalid Wi-Fi MAC address"

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 1ba3978..42e3d55 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);
     }