Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Icee13973b41cd39b59b4eec9ef0e2786bcac1e9d
This commit is contained in:
Quang Luong
2021-07-08 03:48:37 +00:00
committed by Automerger Merge Worker
parent fe53de4820 ec668aae67
commit a6748cc7cb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settingslib.deviceinfo;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.text.TextUtils; import android.text.TextUtils;
@@ -89,7 +90,7 @@ public abstract class AbstractWifiMacAddressPreferenceController
macAddress = macAddresses[0]; macAddress = macAddresses[0];
} }
if (TextUtils.isEmpty(macAddress)) { if (TextUtils.isEmpty(macAddress) || macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
mWifiMacAddress.setSummary(R.string.status_unavailable); mWifiMacAddress.setSummary(R.string.status_unavailable);
} else { } else {
mWifiMacAddress.setSummary(macAddress); mWifiMacAddress.setSummary(macAddress);