From ab71d2776aa0c8c2a1aca01a630b38863656c946 Mon Sep 17 00:00:00 2001 From: Gregory Montoir Date: Wed, 19 Jul 2023 16:00:36 +0800 Subject: [PATCH] Disable WifiMacAddress preference on device without FEATURE_WIFI Bug: 291863659 Test: remove android.hardware.wifi; Settings> Device Preferences> About> Status; preference is not displayed; no NPE in logcat Change-Id: I997aaff01cb513b5d8f63805a2ab102a180853d6 --- .../deviceinfo/AbstractWifiMacAddressPreferenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java index 1d433e767e5bd..5bc271954b25f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java @@ -59,7 +59,7 @@ public abstract class AbstractWifiMacAddressPreferenceController @Override public boolean isAvailable() { - return true; + return mWifiManager != null; } @Override