Merge "Revert "[AAPM] Update support dialog according to API feedback"" into main

6 files changed, 76 insertions, 172 deletions

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index a60fd117fd17..e724ab885c39 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -12676,21 +12676,27 @@ package android.security {
 package android.security.advancedprotection {
 
   @FlaggedApi("android.security.aapm_api") public final class AdvancedProtectionFeature implements android.os.Parcelable {
-    ctor public AdvancedProtectionFeature(int);
+    ctor public AdvancedProtectionFeature(@NonNull String);
     method public int describeContents();
-    method public int getId();
+    method @NonNull public String getId();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.security.advancedprotection.AdvancedProtectionFeature> CREATOR;
   }
 
   @FlaggedApi("android.security.aapm_api") public final class AdvancedProtectionManager {
+    method @NonNull public android.content.Intent createSupportIntent(@NonNull String, @Nullable String);
     method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ADVANCED_PROTECTION_MODE) public java.util.List<android.security.advancedprotection.AdvancedProtectionFeature> getAdvancedProtectionFeatures();
     method @RequiresPermission(android.Manifest.permission.MANAGE_ADVANCED_PROTECTION_MODE) public void setAdvancedProtectionEnabled(boolean);
-    field public static final int FEATURE_ID_DISALLOW_CELLULAR_2G = 0; // 0x0
-    field public static final int FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES = 1; // 0x1
-    field public static final int FEATURE_ID_DISALLOW_USB = 2; // 0x2
-    field public static final int FEATURE_ID_DISALLOW_WEP = 3; // 0x3
-    field public static final int FEATURE_ID_ENABLE_MTE = 4; // 0x4
+    field @FlaggedApi("android.security.aapm_api") public static final String ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG = "android.security.advancedprotection.action.SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG";
+    field public static final String EXTRA_SUPPORT_DIALOG_FEATURE = "android.security.advancedprotection.extra.SUPPORT_DIALOG_FEATURE";
+    field public static final String EXTRA_SUPPORT_DIALOG_TYPE = "android.security.advancedprotection.extra.SUPPORT_DIALOG_TYPE";
+    field public static final String FEATURE_ID_DISALLOW_CELLULAR_2G = "android.security.advancedprotection.feature_disallow_2g";
+    field public static final String FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES = "android.security.advancedprotection.feature_disallow_install_unknown_sources";
+    field public static final String FEATURE_ID_DISALLOW_USB = "android.security.advancedprotection.feature_disallow_usb";
+    field public static final String FEATURE_ID_DISALLOW_WEP = "android.security.advancedprotection.feature_disallow_wep";
+    field public static final String FEATURE_ID_ENABLE_MTE = "android.security.advancedprotection.feature_enable_mte";
+    field public static final String SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION = "android.security.advancedprotection.type_blocked_interaction";
+    field public static final String SUPPORT_DIALOG_TYPE_DISABLED_SETTING = "android.security.advancedprotection.type_disabled_setting";
   }
 
 }
diff --git a/core/java/android/security/advancedprotection/AdvancedProtectionFeature.java b/core/java/android/security/advancedprotection/AdvancedProtectionFeature.java
index d476d960890b..a086bf7f8b08 100644
--- a/core/java/android/security/advancedprotection/AdvancedProtectionFeature.java
+++ b/core/java/android/security/advancedprotection/AdvancedProtectionFeature.java
@@ -30,25 +30,26 @@ import android.security.Flags;
 @FlaggedApi(Flags.FLAG_AAPM_API)
 @SystemApi
 public final class AdvancedProtectionFeature implements Parcelable {
-    private final int mId;
+    private final String mId;
 
     /**
      * Create an object identifying an Advanced Protection feature for AdvancedProtectionManager
-     * @param id Feature identifier. It is used by Settings screens to display information about
-     *           this feature.
+     * @param id A unique ID to identify this feature. It is used by Settings screens to display
+     *           information about this feature.
      */
-    public AdvancedProtectionFeature(@AdvancedProtectionManager.FeatureId int id) {
+    public AdvancedProtectionFeature(@NonNull String id) {
         mId = id;
     }
 
     private AdvancedProtectionFeature(Parcel in) {
-        mId = in.readInt();
+        mId = in.readString8();
     }
 
     /**
      * @return the unique ID representing this feature
      */
-    public int getId() {
+    @NonNull
+    public String getId() {
         return mId;
     }
 
@@ -59,7 +60,7 @@ public final class AdvancedProtectionFeature implements Parcelable {
 
     @Override
     public void writeToParcel(@NonNull Parcel dest, int flags) {
-        dest.writeInt(mId);
+        dest.writeString8(mId);
     }
 
     @NonNull
diff --git a/core/java/android/security/advancedprotection/AdvancedProtectionManager.java b/core/java/android/security/advancedprotection/AdvancedProtectionManager.java
index ea01fc98eda0..59628e8e69d7 100644
--- a/core/java/android/security/advancedprotection/AdvancedProtectionManager.java
+++ b/core/java/android/security/advancedprotection/AdvancedProtectionManager.java
@@ -24,18 +24,17 @@ import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
 import android.Manifest;
 import android.annotation.CallbackExecutor;
 import android.annotation.FlaggedApi;
-import android.annotation.IntDef;
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
+import android.annotation.SdkConstant;
+import android.annotation.StringDef;
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
-import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
-import android.net.wifi.WifiManager;
 import android.os.Binder;
 import android.os.RemoteException;
-import android.os.UserManager;
 import android.security.Flags;
 import android.util.Log;
 
@@ -60,57 +59,54 @@ public final class AdvancedProtectionManager {
     private static final String TAG = "AdvancedProtectionMgr";
 
     /**
-     * Advanced Protection's identifier for setting policies or restrictions in
-     * {@link DevicePolicyManager}.
+     * Advanced Protection's identifier for setting policies or restrictions in DevicePolicyManager.
      *
      * @hide */
     public static final String ADVANCED_PROTECTION_SYSTEM_ENTITY =
             "android.security.advancedprotection";
 
     /**
-     * Feature identifier for disallowing connections to 2G networks.
+     * Feature identifier for disallowing 2G.
      *
-     * @see UserManager#DISALLOW_CELLULAR_2G
      * @hide */
     @SystemApi
-    public static final int FEATURE_ID_DISALLOW_CELLULAR_2G = 0;
+    public static final String FEATURE_ID_DISALLOW_CELLULAR_2G =
+            "android.security.advancedprotection.feature_disallow_2g";
 
     /**
-     * Feature identifier for disallowing installs of apps from unknown sources.
+     * Feature identifier for disallowing install of unknown sources.
      *
-     * @see UserManager#DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY
      * @hide */
     @SystemApi
-    public static final int FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES = 1;
+    public static final String FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES =
+            "android.security.advancedprotection.feature_disallow_install_unknown_sources";
 
     /**
-     * Feature identifier for disallowing USB connections.
+     * Feature identifier for disallowing USB.
      *
      * @hide */
     @SystemApi
-    public static final int FEATURE_ID_DISALLOW_USB = 2;
+    public static final String FEATURE_ID_DISALLOW_USB =
+            "android.security.advancedprotection.feature_disallow_usb";
 
     /**
-     * Feature identifier for disallowing connections to Wi-Fi Wired Equivalent Privacy (WEP)
-     * networks.
+     * Feature identifier for disallowing WEP.
      *
-     * @see WifiManager#isWepSupported()
      * @hide */
     @SystemApi
-    public static final int FEATURE_ID_DISALLOW_WEP = 3;
+    public static final String FEATURE_ID_DISALLOW_WEP =
+            "android.security.advancedprotection.feature_disallow_wep";
 
     /**
-     * Feature identifier for enabling the Memory Tagging Extension (MTE). MTE is a CPU extension
-     * that allows to protect against certain classes of security problems at a small runtime
-     * performance cost overhead.
+     * Feature identifier for enabling MTE.
      *
-     * @see DevicePolicyManager#setMtePolicy(int)
      * @hide */
     @SystemApi
-    public static final int FEATURE_ID_ENABLE_MTE = 4;
+    public static final String FEATURE_ID_ENABLE_MTE =
+            "android.security.advancedprotection.feature_enable_mte";
 
     /** @hide */
-    @IntDef(prefix = { "FEATURE_ID_" }, value = {
+    @StringDef(prefix = { "FEATURE_ID_" }, value = {
             FEATURE_ID_DISALLOW_CELLULAR_2G,
             FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES,
             FEATURE_ID_DISALLOW_USB,
@@ -120,7 +116,7 @@ public final class AdvancedProtectionManager {
     @Retention(RetentionPolicy.SOURCE)
     public @interface FeatureId {}
 
-    private static final Set<Integer> ALL_FEATURE_IDS = Set.of(
+    private static final Set<String> ALL_FEATURE_IDS = Set.of(
             FEATURE_ID_DISALLOW_CELLULAR_2G,
             FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES,
             FEATURE_ID_DISALLOW_USB,
@@ -139,6 +135,9 @@ public final class AdvancedProtectionManager {
      * Output: Nothing.
      *
      * @hide */
+    @SystemApi
+    @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
+    @FlaggedApi(android.security.Flags.FLAG_AAPM_API)
     public static final String ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG =
             "android.security.advancedprotection.action.SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG";
 
@@ -148,6 +147,7 @@ public final class AdvancedProtectionManager {
      *
      * @hide */
     @FeatureId
+    @SystemApi
     public static final String EXTRA_SUPPORT_DIALOG_FEATURE =
             "android.security.advancedprotection.extra.SUPPORT_DIALOG_FEATURE";
 
@@ -157,41 +157,37 @@ public final class AdvancedProtectionManager {
      *
      * @hide */
     @SupportDialogType
+    @SystemApi
     public static final String EXTRA_SUPPORT_DIALOG_TYPE =
             "android.security.advancedprotection.extra.SUPPORT_DIALOG_TYPE";
 
     /**
-     * Type for {@link #EXTRA_SUPPORT_DIALOG_TYPE} indicating an unknown action was blocked by
-     * advanced protection, hence the support dialog should display a default explanation.
-     *
-     * @hide */
-    public static final int SUPPORT_DIALOG_TYPE_UNKNOWN = 0;
-
-    /**
      * Type for {@link #EXTRA_SUPPORT_DIALOG_TYPE} indicating a user performed an action that was
      * blocked by advanced protection.
      *
      * @hide */
-    public static final int SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION = 1;
+    @SystemApi
+    public static final String SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION =
+            "android.security.advancedprotection.type_blocked_interaction";
 
     /**
      * Type for {@link #EXTRA_SUPPORT_DIALOG_TYPE} indicating a user pressed on a setting toggle
      * that was disabled by advanced protection.
      *
      * @hide */
-    public static final int SUPPORT_DIALOG_TYPE_DISABLED_SETTING = 2;
+    @SystemApi
+    public static final String SUPPORT_DIALOG_TYPE_DISABLED_SETTING =
+            "android.security.advancedprotection.type_disabled_setting";
 
     /** @hide */
-    @IntDef(prefix = { "SUPPORT_DIALOG_TYPE_" }, value = {
-            SUPPORT_DIALOG_TYPE_UNKNOWN,
+    @StringDef(prefix = { "SUPPORT_DIALOG_TYPE_" }, value = {
             SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION,
             SUPPORT_DIALOG_TYPE_DISABLED_SETTING,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface SupportDialogType {}
 
-    private static final Set<Integer> ALL_SUPPORT_DIALOG_TYPES = Set.of(
-            SUPPORT_DIALOG_TYPE_UNKNOWN,
+    private static final Set<String> ALL_SUPPORT_DIALOG_TYPES = Set.of(
             SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION,
             SUPPORT_DIALOG_TYPE_DISABLED_SETTING);
 
@@ -328,13 +324,15 @@ public final class AdvancedProtectionManager {
      *                disabled by advanced protection.
      * @hide
      */
-    public static @NonNull Intent createSupportIntent(@FeatureId int featureId,
-            @SupportDialogType int type) {
+    @SystemApi
+    public @NonNull Intent createSupportIntent(@NonNull @FeatureId String featureId,
+            @Nullable @SupportDialogType String type) {
+        Objects.requireNonNull(featureId);
         if (!ALL_FEATURE_IDS.contains(featureId)) {
             throw new IllegalArgumentException(featureId + " is not a valid feature ID. See"
                     + " FEATURE_ID_* APIs.");
         }
-        if (!ALL_SUPPORT_DIALOG_TYPES.contains(type)) {
+        if (type != null && !ALL_SUPPORT_DIALOG_TYPES.contains(type)) {
             throw new IllegalArgumentException(type + " is not a valid type. See"
                     + " SUPPORT_DIALOG_TYPE_* APIs.");
         }
@@ -342,19 +340,21 @@ public final class AdvancedProtectionManager {
         Intent intent = new Intent(ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG);
         intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(EXTRA_SUPPORT_DIALOG_FEATURE, featureId);
-        intent.putExtra(EXTRA_SUPPORT_DIALOG_TYPE, type);
+        if (type != null) {
+            intent.putExtra(EXTRA_SUPPORT_DIALOG_TYPE, type);
+        }
         return intent;
     }
 
     /** @hide */
-    public static @NonNull Intent createSupportIntentForPolicyIdentifierOrRestriction(
-            @NonNull String identifier, @SupportDialogType int type) {
+    public @NonNull Intent createSupportIntentForPolicyIdentifierOrRestriction(
+            @NonNull String identifier, @Nullable @SupportDialogType String type) {
         Objects.requireNonNull(identifier);
-        if (!ALL_SUPPORT_DIALOG_TYPES.contains(type)) {
+        if (type != null && !ALL_SUPPORT_DIALOG_TYPES.contains(type)) {
             throw new IllegalArgumentException(type + " is not a valid type. See"
                     + " SUPPORT_DIALOG_TYPE_* APIs.");
         }
-        final int featureId;
+        final String featureId;
         if (DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY.equals(identifier)) {
             featureId = FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES;
         } else if (DISALLOW_CELLULAR_2G.equals(identifier)) {
diff --git a/core/tests/coretests/src/android/security/advancedprotection/AdvancedProtectionManagerTest.java b/core/tests/coretests/src/android/security/advancedprotection/AdvancedProtectionManagerTest.java
deleted file mode 100644
index 45864b01c795..000000000000
--- a/core/tests/coretests/src/android/security/advancedprotection/AdvancedProtectionManagerTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.security.advancedprotection;
-
-import static android.security.advancedprotection.AdvancedProtectionManager.ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG;
-import static android.security.advancedprotection.AdvancedProtectionManager.EXTRA_SUPPORT_DIALOG_FEATURE;
-import static android.security.advancedprotection.AdvancedProtectionManager.EXTRA_SUPPORT_DIALOG_TYPE;
-import static android.security.advancedprotection.AdvancedProtectionManager.FEATURE_ID_DISALLOW_CELLULAR_2G;
-import static android.security.advancedprotection.AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION;
-import static android.security.advancedprotection.AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_DISABLED_SETTING;
-import static android.security.advancedprotection.AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_UNKNOWN;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-
-import android.content.Intent;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class AdvancedProtectionManagerTest {
-    private static final int FEATURE_ID_INVALID = -1;
-    private static final int SUPPORT_DIALOG_TYPE_INVALID = -1;
-
-    @Test
-    public void testCreateSupportIntent_validFeature_validTypeUnknown_createsIntent() {
-        Intent intent = AdvancedProtectionManager.createSupportIntent(
-                FEATURE_ID_DISALLOW_CELLULAR_2G, SUPPORT_DIALOG_TYPE_UNKNOWN);
-
-        assertEquals(ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG, intent.getAction());
-        assertEquals(FEATURE_ID_DISALLOW_CELLULAR_2G, intent.getIntExtra(
-                EXTRA_SUPPORT_DIALOG_FEATURE, FEATURE_ID_INVALID));
-        assertEquals(SUPPORT_DIALOG_TYPE_UNKNOWN, intent.getIntExtra(EXTRA_SUPPORT_DIALOG_TYPE,
-                SUPPORT_DIALOG_TYPE_INVALID));
-    }
-
-    @Test
-    public void testCreateSupportIntent_validFeature_validTypeBlockedInteraction_createsIntent() {
-        Intent intent = AdvancedProtectionManager.createSupportIntent(
-                FEATURE_ID_DISALLOW_CELLULAR_2G, SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION);
-
-        assertEquals(ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG, intent.getAction());
-        assertEquals(FEATURE_ID_DISALLOW_CELLULAR_2G, intent.getIntExtra(
-                EXTRA_SUPPORT_DIALOG_FEATURE, FEATURE_ID_INVALID));
-        assertEquals(SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION, intent.getIntExtra(
-                EXTRA_SUPPORT_DIALOG_TYPE, SUPPORT_DIALOG_TYPE_INVALID));
-    }
-
-    @Test
-    public void testCreateSupportIntent_validFeature_validTypeDisabledSetting_createsIntent() {
-        Intent intent = AdvancedProtectionManager.createSupportIntent(
-                FEATURE_ID_DISALLOW_CELLULAR_2G, SUPPORT_DIALOG_TYPE_DISABLED_SETTING);
-
-        assertEquals(ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG, intent.getAction());
-        assertEquals(FEATURE_ID_DISALLOW_CELLULAR_2G, intent.getIntExtra(
-                EXTRA_SUPPORT_DIALOG_FEATURE, FEATURE_ID_INVALID));
-        assertEquals(SUPPORT_DIALOG_TYPE_DISABLED_SETTING, intent.getIntExtra(
-                EXTRA_SUPPORT_DIALOG_TYPE, SUPPORT_DIALOG_TYPE_INVALID));
-    }
-
-    @Test
-    public void testCreateSupportIntent_validFeature_invalidType_throwsIllegalArgument() {
-        assertThrows(IllegalArgumentException.class, () ->
-                AdvancedProtectionManager.createSupportIntent(FEATURE_ID_DISALLOW_CELLULAR_2G,
-                        SUPPORT_DIALOG_TYPE_INVALID));
-    }
-
-    @Test
-    public void testCreateSupportIntent_invalidFeature_validType_throwsIllegalArgument() {
-        assertThrows(IllegalArgumentException.class, () ->
-                AdvancedProtectionManager.createSupportIntent(FEATURE_ID_INVALID,
-                        SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION));
-    }
-
-    @Test
-    public void testCreateSupportIntent_invalidFeature_invalidType_throwsIllegalArgument() {
-        assertThrows(IllegalArgumentException.class, () ->
-                AdvancedProtectionManager.createSupportIntent(FEATURE_ID_INVALID,
-                        SUPPORT_DIALOG_TYPE_INVALID));
-    }
-}
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt
index c71b19c9235f..e01f27964733 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt
@@ -501,7 +501,7 @@ open class WifiUtils {
                 val wifiManager = context.getSystemService(WifiManager::class.java) ?: return@launch
                 val aapmManager = context.getSystemService(AdvancedProtectionManager::class.java)
                 if (isAdvancedProtectionEnabled(aapmManager)) {
-                    val intent = AdvancedProtectionManager.createSupportIntent(
+                    val intent = aapmManager.createSupportIntent(
                         AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP,
                         AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION)
                     onStartActivity(intent)
diff --git a/services/tests/servicestests/src/com/android/server/security/advancedprotection/AdvancedProtectionServiceTest.java b/services/tests/servicestests/src/com/android/server/security/advancedprotection/AdvancedProtectionServiceTest.java
index c7a06b8eec7b..b1df0f1e9cce 100644
--- a/services/tests/servicestests/src/com/android/server/security/advancedprotection/AdvancedProtectionServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/security/advancedprotection/AdvancedProtectionServiceTest.java
@@ -31,7 +31,6 @@ import android.os.test.FakePermissionEnforcer;
 import android.os.test.TestLooper;
 import android.provider.Settings;
 import android.security.advancedprotection.AdvancedProtectionFeature;
-import android.security.advancedprotection.AdvancedProtectionManager;
 import android.security.advancedprotection.IAdvancedProtectionCallback;
 
 import androidx.annotation.NonNull;
@@ -55,8 +54,7 @@ public class AdvancedProtectionServiceTest {
     private Context mContext;
     private AdvancedProtectionService.AdvancedProtectionStore mStore;
     private TestLooper mLooper;
-    AdvancedProtectionFeature mTestFeature2g = new AdvancedProtectionFeature(
-            AdvancedProtectionManager.FEATURE_ID_DISALLOW_CELLULAR_2G);
+    AdvancedProtectionFeature mFeature = new AdvancedProtectionFeature("test-id");
 
     @Before
     public void setup() throws Settings.SettingNotFoundException {
@@ -107,7 +105,7 @@ public class AdvancedProtectionServiceTest {
                     @NonNull
                     @Override
                     public AdvancedProtectionFeature getFeature() {
-                        return mTestFeature2g;
+                        return mFeature;
                     }
 
                     @Override
@@ -137,7 +135,7 @@ public class AdvancedProtectionServiceTest {
                     @NonNull
                     @Override
                     public AdvancedProtectionFeature getFeature() {
-                        return mTestFeature2g;
+                        return mFeature;
                     }
 
                     @Override
@@ -167,7 +165,7 @@ public class AdvancedProtectionServiceTest {
                     @NonNull
                     @Override
                     public AdvancedProtectionFeature getFeature() {
-                        return mTestFeature2g;
+                        return mFeature;
                     }
 
                     @Override
@@ -240,10 +238,8 @@ public class AdvancedProtectionServiceTest {
 
     @Test
     public void testGetFeatures() {
-        AdvancedProtectionFeature feature1 = new AdvancedProtectionFeature(
-                AdvancedProtectionManager.FEATURE_ID_DISALLOW_CELLULAR_2G);
-        AdvancedProtectionFeature feature2 = new AdvancedProtectionFeature(
-                AdvancedProtectionManager.FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES);
+        AdvancedProtectionFeature feature1 = new AdvancedProtectionFeature("id-1");
+        AdvancedProtectionFeature feature2 = new AdvancedProtectionFeature("id-2");
         AdvancedProtectionHook hook = new AdvancedProtectionHook(mContext, true) {
             @NonNull
             @Override
@@ -272,10 +268,8 @@ public class AdvancedProtectionServiceTest {
 
     @Test
     public void testGetFeatures_featureNotAvailable() {
-        AdvancedProtectionFeature feature1 = new AdvancedProtectionFeature(
-                AdvancedProtectionManager.FEATURE_ID_DISALLOW_CELLULAR_2G);
-        AdvancedProtectionFeature feature2 = new AdvancedProtectionFeature(
-                AdvancedProtectionManager.FEATURE_ID_DISALLOW_INSTALL_UNKNOWN_SOURCES);
+        AdvancedProtectionFeature feature1 = new AdvancedProtectionFeature("id-1");
+        AdvancedProtectionFeature feature2 = new AdvancedProtectionFeature("id-2");
         AdvancedProtectionHook hook = new AdvancedProtectionHook(mContext, true) {
             @NonNull
             @Override