[Passpoint] Remove FEATURE_WIFI_PASSPOINT

Remove FEATURE_WIFI_PASSPOINT conditionals from WifiServiceImpl.java and
WifiInjector.java, since Passpoint is a feature that must be enabled.
Removed unnecessary unit test cases.

Bug: 134099536
Test: atest WifiServiceImplTest
Change-Id: I8f3e27a8ddf69e511bad5e467f8504578fd8e0d4

3 files changed, 6 insertions, 84 deletions

diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index 082dfc2ce..3e01046dc 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -21,7 +21,6 @@ import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.AppOpsManager;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.hardware.SystemSensorManager;
 import android.net.IpMemoryStore;
 import android.net.NetworkCapabilities;
@@ -341,9 +340,7 @@ public class WifiInjector {
         // Register the various network evaluators with the network selector.
         mWifiNetworkSelector.registerNetworkEvaluator(mSavedNetworkEvaluator);
         mWifiNetworkSelector.registerNetworkEvaluator(mNetworkSuggestionEvaluator);
-        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            mWifiNetworkSelector.registerNetworkEvaluator(mPasspointNetworkEvaluator);
-        }
+        mWifiNetworkSelector.registerNetworkEvaluator(mPasspointNetworkEvaluator);
         mWifiNetworkSelector.registerNetworkEvaluator(mCarrierNetworkEvaluator);
         mWifiNetworkSelector.registerNetworkEvaluator(mScoredNetworkEvaluator);
 
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index a0e5bb21e..d0025b6c8 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1922,9 +1922,6 @@ public class WifiServiceImpl extends BaseWifiService {
         if (mVerboseLoggingEnabled) {
             mLog.info("getMatchingPasspointConfigurations uid=%").c(Binder.getCallingUid()).flush();
         }
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            return new HashMap<>();
-        }
         return mClientModeImpl.syncGetAllMatchingFqdnsForScanResults(scanResults,
                 mClientModeImplChannel);
     }
@@ -1944,9 +1941,6 @@ public class WifiServiceImpl extends BaseWifiService {
         if (mVerboseLoggingEnabled) {
             mLog.info("getMatchingOsuProviders uid=%").c(Binder.getCallingUid()).flush();
         }
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            return new HashMap<>();
-        }
         return mClientModeImpl.syncGetMatchingOsuProviders(scanResults, mClientModeImplChannel);
     }
 
@@ -1966,9 +1960,6 @@ public class WifiServiceImpl extends BaseWifiService {
             mLog.info("getMatchingPasspointConfigsForOsuProviders uid=%").c(
                     Binder.getCallingUid()).flush();
         }
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            return new HashMap<>();
-        }
         if (osuProviders == null) {
             Log.e(TAG, "Attempt to retrieve Passpoint configuration with null osuProviders");
             return new HashMap<>();
@@ -1995,9 +1986,6 @@ public class WifiServiceImpl extends BaseWifiService {
             mLog.info("getWifiConfigsForPasspointProfiles uid=%").c(
                     Binder.getCallingUid()).flush();
         }
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            return new ArrayList<>();
-        }
         if (fqdnList == null) {
             Log.e(TAG, "Attempt to retrieve WifiConfiguration with null fqdn List");
             return new ArrayList<>();
@@ -2272,10 +2260,6 @@ public class WifiServiceImpl extends BaseWifiService {
             return false;
         }
         mLog.info("addorUpdatePasspointConfiguration uid=%").c(Binder.getCallingUid()).flush();
-        if (!mContext.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            return false;
-        }
         return mClientModeImpl.syncAddOrUpdatePasspointConfig(mClientModeImplChannel, config,
                 Binder.getCallingUid(), packageName);
     }
@@ -2297,9 +2281,6 @@ public class WifiServiceImpl extends BaseWifiService {
             throw new SecurityException(TAG + ": Permission denied");
         }
         mLog.info("removePasspointConfiguration uid=%").c(Binder.getCallingUid()).flush();
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            return false;
-        }
         return mClientModeImpl.syncRemovePasspointConfig(mClientModeImplChannel, fqdn);
     }
 
@@ -2324,10 +2305,6 @@ public class WifiServiceImpl extends BaseWifiService {
         if (mVerboseLoggingEnabled) {
             mLog.info("getPasspointConfigurations uid=%").c(Binder.getCallingUid()).flush();
         }
-        if (!mContext.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            return new ArrayList<>();
-        }
         return mClientModeImpl.syncGetPasspointConfigs(mClientModeImplChannel);
     }
 
@@ -2340,10 +2317,6 @@ public class WifiServiceImpl extends BaseWifiService {
     public void queryPasspointIcon(long bssid, String fileName) {
         enforceAccessPermission();
         mLog.info("queryPasspointIcon uid=%").c(Binder.getCallingUid()).flush();
-        if (!mContext.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            throw new UnsupportedOperationException("Passpoint not enabled");
-        }
         mClientModeImpl.syncQueryPasspointIcon(mClientModeImplChannel, bssid, fileName);
     }
 
@@ -2952,14 +2925,11 @@ public class WifiServiceImpl extends BaseWifiService {
                 }
 
                 // Delete all Passpoint configurations
-                if (mContext.getPackageManager().hasSystemFeature(
-                        PackageManager.FEATURE_WIFI_PASSPOINT)) {
-                    List<PasspointConfiguration> configs = mClientModeImpl.syncGetPasspointConfigs(
-                            mClientModeImplChannel);
-                    if (configs != null) {
-                        for (PasspointConfiguration config : configs) {
-                            removePasspointConfiguration(config.getHomeSp().getFqdn(), packageName);
-                        }
+                List<PasspointConfiguration> configs = mClientModeImpl.syncGetPasspointConfigs(
+                        mClientModeImplChannel);
+                if (configs != null) {
+                    for (PasspointConfiguration config : configs) {
+                        removePasspointConfiguration(config.getHomeSp().getFqdn(), packageName);
                     }
                 }
             }
@@ -3121,10 +3091,6 @@ public class WifiServiceImpl extends BaseWifiService {
         if (!isSettingsOrSuw(Binder.getCallingPid(), Binder.getCallingUid())) {
             throw new SecurityException(TAG + ": Permission denied");
         }
-        if (!mContext.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_WIFI_PASSPOINT)) {
-            throw new UnsupportedOperationException("Passpoint not enabled");
-        }
         final int uid = Binder.getCallingUid();
         mLog.trace("startSubscriptionProvisioning uid=%").c(uid).flush();
         if (mClientModeImpl.syncStartSubscriptionProvisioning(uid, provider,
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index 80b7406ee..d6651e727 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -385,8 +385,6 @@ public class WifiServiceImplTest {
         when(mWifiInjector.getWifiScoreCard()).thenReturn(mWifiScoreCard);
         when(mClientModeImpl.syncStartSubscriptionProvisioning(anyInt(),
                 any(OsuProvider.class), any(IProvisioningCallback.class), any())).thenReturn(true);
-        when(mPackageManager.hasSystemFeature(
-                PackageManager.FEATURE_WIFI_PASSPOINT)).thenReturn(true);
         // Create an OSU provider that can be provisioned via an open OSU AP
         mOsuProvider = PasspointProvisioningTestUtil.generateOsuProvider(true);
         when(mContext.getOpPackageName()).thenReturn(TEST_PACKAGE_NAME);
@@ -2514,7 +2512,6 @@ public class WifiServiceImplTest {
         config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS);
 
         PackageManager pm = mock(PackageManager.class);
-        when(pm.hasSystemFeature(PackageManager.FEATURE_WIFI_PASSPOINT)).thenReturn(true);
         when(mContext.getPackageManager()).thenReturn(pm);
         when(pm.getApplicationInfo(any(), anyInt())).thenReturn(mApplicationInfo);
         when(mWifiPermissionsUtil.isTargetSdkLessThan(anyString(),
@@ -2594,21 +2591,6 @@ public class WifiServiceImplTest {
     }
 
     /**
-     * Verify that the call to startSubscriptionProvisioning is not directed to the Passpoint
-     * specific API startSubscriptionProvisioning when the feature is not supported.
-     */
-    @Test(expected = UnsupportedOperationException.class)
-    public void testStartSubscriptionProvisioniningPasspointUnsupported() throws Exception {
-        when(mContext.checkPermission(eq(android.Manifest.permission.NETWORK_SETTINGS),
-                anyInt(), anyInt())).thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mContext.checkPermission(eq(android.Manifest.permission.NETWORK_SETUP_WIZARD),
-                anyInt(), anyInt())).thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManager.hasSystemFeature(
-                PackageManager.FEATURE_WIFI_PASSPOINT)).thenReturn(false);
-        mWifiServiceImpl.startSubscriptionProvisioning(mOsuProvider, mProvisioningCallback);
-    }
-
-    /**
      * Verify that the call to startSubscriptionProvisioning is not redirected to the Passpoint
      * specific API startSubscriptionProvisioning when the caller provides invalid arguments
      */
@@ -3521,29 +3503,6 @@ public class WifiServiceImplTest {
     }
 
     /**
-     * Verify that Passpoint configuration is not removed in factoryReset if Passpoint feature
-     * is not supported.
-     */
-    @Test
-    public void testFactoryResetWithoutPasspointSupport() throws Exception {
-        setupClientModeImplHandlerForPost();
-
-        mWifiServiceImpl.mClientModeImplChannel = mAsyncChannel;
-        when(mPackageManager.hasSystemFeature(
-                PackageManager.FEATURE_WIFI_PASSPOINT)).thenReturn(false);
-
-        mWifiServiceImpl.factoryReset(TEST_PACKAGE_NAME);
-        mLooper.dispatchAll();
-
-        verify(mClientModeImpl).syncGetConfiguredNetworks(anyInt(), any(), anyInt());
-        verify(mClientModeImpl, never()).syncGetPasspointConfigs(any());
-        verify(mClientModeImpl, never()).syncRemovePasspointConfig(any(), anyString());
-        verify(mWifiConfigManager).clearDeletedEphemeralNetworks();
-        verify(mClientModeImpl).clearNetworkRequestUserApprovedAccessPoints();
-        verify(mWifiNetworkSuggestionsManager).clear();
-    }
-
-    /**
      * Verify that a call to factoryReset throws a SecurityException if the caller does not have
      * the CONNECTIVITY_INTERNAL permission.
      */