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

Commit afe209c1 authored by Quang Luong's avatar Quang Luong Committed by Automerger Merge Worker
Browse files

Merge "Show "Unavailable" when factory Wi-Fi MAC address is default" into sc-dev am: ec668aae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15222568

Change-Id: I233906814663814cbbb2ba3f8698f9072e2182dc
parents 7fedf9af ec668aae

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settingslib.deviceinfo; 
import android.annotation.SuppressLint;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.text.TextUtils;
@@ -89,7 +90,7 @@ public abstract class AbstractWifiMacAddressPreferenceController 
            macAddress = macAddresses[0];

        }



        if (TextUtils.isEmpty(macAddress)) {

        if (TextUtils.isEmpty(macAddress) || macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {

            mWifiMacAddress.setSummary(R.string.status_unavailable);

        } else {

            mWifiMacAddress.setSummary(macAddress);