Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31b0da66 authored by Paul Stewart's avatar Paul Stewart Committed by android-build-merger
Browse files

Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b86 am: 27c5edb9 am: dab924f0 

am: 09797c33

Change-Id: I12cc021a1abead960ec28354e9d6e94ea8090c88
parents 0cbb338e 09797c33

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }