From 7b42f5c3e0c17b889b58e3eff29e303aa717dc13 Mon Sep 17 00:00:00 2001 From: Gabriel Biren Date: Wed, 5 Feb 2025 17:12:43 +0000 Subject: Check both OEM and chip support in the P2P, Aware, and Passpoint-supported APIs. Bug: 369252118 Flag: EXEMPT minor behavior change Test: Call isP2pSupported from the CTS test and log the result Change-Id: I4ff8f868856bb4eee54e65d4297ca207fad9de18 --- framework/java/android/net/wifi/WifiManager.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'framework/java') diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java index 49c57c35eb..0ebf06fa5d 100644 --- a/framework/java/android/net/wifi/WifiManager.java +++ b/framework/java/android/net/wifi/WifiManager.java @@ -46,6 +46,7 @@ import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledAfter; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; +import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.DhcpInfo; @@ -4085,14 +4086,18 @@ public class WifiManager { * @hide */ public boolean isPasspointSupported() { - return isFeatureSupported(WIFI_FEATURE_PASSPOINT); + // Both OEM and chip support are required + return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT) + && isFeatureSupported(WIFI_FEATURE_PASSPOINT); } /** * @return true if this adapter supports WifiP2pManager (Wi-Fi Direct) */ public boolean isP2pSupported() { - return isFeatureSupported(WIFI_FEATURE_P2P); + // Both OEM and chip support are required + return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT) + && isFeatureSupported(WIFI_FEATURE_P2P); } /** @@ -4118,7 +4123,9 @@ public class WifiManager { * @hide */ public boolean isWifiAwareSupported() { - return isFeatureSupported(WIFI_FEATURE_AWARE); + // Both OEM and chip support are required + return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_AWARE) + && isFeatureSupported(WIFI_FEATURE_AWARE); } /** -- cgit v1.2.3-59-g8ed1b