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

Commit 27c5edb9 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

Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
parents ce2a10b7 917b7b86

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);

    }