PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c

Browse Source 
am: 27c5edb968

Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c
This commit is contained in:
Paul Stewart
2016-10-28 21:09:38 +00:00
committed by android-build-merger
parent 6e8a67c008 27c5edb968
commit dab924f04d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/deviceinfo/Status.java
View File

@@ -280,7 +280,8 @@ public class Status extends SettingsPreferenceFragment {
private void setWifiStatus() { private void setWifiStatus() {
WifiInfo wifiInfo = mWifiManager.getConnectionInfo(); 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); mWifiMacAddress.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress : mUnavailable);
} }