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 am: 27c5edb968 am: dab924f04d

Browse Source 
am: 09797c330c

Change-Id: I12cc021a1abead960ec28354e9d6e94ea8090c88
This commit is contained in:
Paul Stewart
2016-10-28 21:20:19 +00:00
committed by android-build-merger
parent 0cbb338ecc 09797c330c
commit 31b0da66a6
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() {
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);
}