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

This commit is contained in:
Treehugger Robot
2016-10-28 20:56:35 +00:00
committed by Gerrit Code Review

View File

@@ -280,7 +280,8 @@ public class Status extends SettingsPreferenceFragment {
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);
}