gmscompat: Add WifiManager hooks for baseline compatibility

This is part of GmsCompat's baseline compatibility for unprivileged Google Play Services. Change-Id: I2f56a47a6a732d6a73531c7f80aca69065a88c38
GrapheneOS · Mar 7, 2022 · 7ddba36 · 7ddba36
1 parent e956338
commit 7ddba36
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java
@@ -32,6 +32,7 @@
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
 import android.app.ActivityManager;
+import android.app.compat.gms.GmsCompat;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.net.ConnectivityManager;
@@ -1540,6 +1541,10 @@ public List<WifiConfiguration> getPrivilegedConfiguredNetworks() {
     @NonNull
     public List<Pair<WifiConfiguration, Map<Integer, List<ScanResult>>>> getAllMatchingWifiConfigs(
             @NonNull List<ScanResult> scanResults) {
+        if (GmsCompat.isEnabled()) {
+            return Collections.emptyList();
+        }
+
         List<Pair<WifiConfiguration, Map<Integer, List<ScanResult>>>> configs = new ArrayList<>();
         try {
             Map<String, Map<Integer, List<ScanResult>>> results =
@@ -1612,6 +1617,10 @@ public List<WifiConfiguration> getWifiConfigForMatchedNetworkSuggestionsSharedWi
     @NonNull
     public Map<OsuProvider, List<ScanResult>> getMatchingOsuProviders(
             @Nullable List<ScanResult> scanResults) {
+        if (GmsCompat.isEnabled()) {
+            return Collections.emptyMap();
+        }
+
         if (scanResults == null) {
             return new HashMap<>();
         }
@@ -1642,6 +1651,10 @@ public Map<OsuProvider, List<ScanResult>> getMatchingOsuProviders(
     @NonNull
     public Map<OsuProvider, PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders(
             @NonNull Set<OsuProvider> osuProviders) {
+        if (GmsCompat.isEnabled()) {
+            return Collections.emptyMap();
+        }
+
         try {
             return mService.getMatchingPasspointConfigsForOsuProviders(
                     new ArrayList<>(osuProviders));
@@ -6160,6 +6173,10 @@ public void factoryReset() {
             android.Manifest.permission.NETWORK_SETUP_WIZARD
     })
     public Network getCurrentNetwork() {
+        if (GmsCompat.isEnabled()) {
+            return null;
+        }
+
         try {
             return mService.getCurrentNetwork();
         } catch (RemoteException e) {