Merge "Replace allowPrivateProfile flag with sdk version check" into main

6 files changed, 7 insertions, 14 deletions

diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java b/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java
index 41233a23e..00ec67569 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java
@@ -18,7 +18,6 @@ package com.android.role.controller.util;
 
 import android.content.Context;
 import android.os.Build;
-import android.os.Flags;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -91,7 +90,7 @@ public final class UserUtils {
      * allowed from Android V+ only, so this method will return false on Sdk levels below that.
      */
     public static boolean isPrivateProfile(@NonNull UserHandle user, @NonNull Context context) {
-        if (!SdkLevel.isAtLeastV() || !Flags.allowPrivateProfile()) {
+        if (!SdkLevel.isAtLeastV()) {
             return false;
         }
         Context userContext = getUserContext(context, user);
diff --git a/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java b/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java
index 4d778befb..10e8dd0e1 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java
+++ b/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java
@@ -139,7 +139,7 @@ public class UserUtils {
      */
     private static boolean isPrivateProfile(@NonNull UserHandle userHandle,
             @NonNull Context context) {
-        if (!SdkLevel.isAtLeastV() || !android.os.Flags.allowPrivateProfile()) {
+        if (!SdkLevel.isAtLeastV()) {
             return false;
         }
         Context userContext = context.createContextAsUser(userHandle, /* flags= */ 0);
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt
index 8d7d96f99..307ef9cf6 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt
@@ -331,9 +331,7 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() {
         get() = SafetyCenterIds.entryIdFromString(id)
 
     private fun isPrivateProfileSupported(): Boolean {
-        return SdkLevel.isAtLeastV() &&
-            com.android.permission.flags.Flags.privateProfileSupported() &&
-            android.os.Flags.allowPrivateProfile()
+        return SdkLevel.isAtLeastV() && com.android.permission.flags.Flags.privateProfileSupported()
     }
 
     companion object {
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt
index b89abde13..551f676f1 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt
@@ -49,7 +49,7 @@ class SafetySubpageEntryPreference(
     context: Context,
     private val launchTaskId: Int?,
     private val entry: SafetyCenterEntry,
-    private val viewModel: SafetyCenterViewModel
+    private val viewModel: SafetyCenterViewModel,
 ) : TwoTargetPreference(context), ComparablePreference {
 
     init {
@@ -108,9 +108,7 @@ class SafetySubpageEntryPreference(
     }
 
     private fun isPrivateProfileSupported(): Boolean {
-        return SdkLevel.isAtLeastV() &&
-            com.android.permission.flags.Flags.privateProfileSupported() &&
-            android.os.Flags.allowPrivateProfile()
+        return SdkLevel.isAtLeastV() && com.android.permission.flags.Flags.privateProfileSupported()
     }
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
@@ -125,7 +123,7 @@ class SafetySubpageEntryPreference(
                     PendingIntentSender.send(iconAction.pendingIntent, launchTaskId)
                     viewModel.interactionLogger.recordForEntry(
                         Action.ENTRY_ICON_ACTION_CLICKED,
-                        entry
+                        entry,
                     )
                 } catch (ex: Exception) {
                     Log.e(TAG, "Failed to execute icon action intent for $entry", ex)
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java
index 87d8744a8..0da8286f6 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java
@@ -98,8 +98,7 @@ public class StaticSafetyEntryPreference extends Preference implements Comparabl
 
     private Boolean isPrivateProfileSupported() {
         return SdkLevel.isAtLeastV()
-                && com.android.permission.flags.Flags.privateProfileSupported()
-                && android.os.Flags.allowPrivateProfile();
+                && com.android.permission.flags.Flags.privateProfileSupported();
     }
 
     @Override
diff --git a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java
index 3bc3ff12b..e15614be2 100644
--- a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java
+++ b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java
@@ -878,7 +878,6 @@ public class RoleManagerTest {
     }
 
     @Test
-    @RequiresFlagsEnabled(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE)
     @EnsureHasPrivateProfile(installInstrumentedApp = OptionalBoolean.TRUE)
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM,
             codeName = "VanillaIceCream")