Merge "Hide private profile apps from privacy dashboard" into main

3 files changed, 40 insertions, 2 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt
index 826e57ece..40ee75636 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt
@@ -32,6 +32,7 @@ import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.os.UserHandle
+import android.os.UserManager
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.AbstractSavedStateViewModelFactory
 import androidx.lifecycle.SavedStateHandle
@@ -85,6 +86,8 @@ class PermissionUsageDetailsViewModel(
 
     private val roleManager =
         Utils.getSystemServiceSafe(application.applicationContext, RoleManager::class.java)
+    private val userManager =
+        Utils.getSystemServiceSafe(application.applicationContext, UserManager::class.java)
 
     /** Updates whether system app permissions usage should be displayed in the UI. */
     fun updateShowSystemAppsToggle(showSystem: Boolean) {
@@ -191,6 +194,7 @@ class PermissionUsageDetailsViewModel(
     ): List<AppPermissionAccessUiInfo> {
         return allLightHistoricalPackageOpsLiveData
             .getLightHistoricalPackageOps()
+            ?.filter { Utils.shouldShowInSettings(it.userHandle, userManager) }
             ?.flatMap { it.clusterAccesses(startTime, showSystem) }
             ?.sortedBy { -1 * it.discreteAccesses.first().accessTimeMs }
             ?.map { it.buildAppPermissionAccessUiInfo() }
@@ -488,7 +492,8 @@ class PermissionUsageDetailsViewModel(
             ?.let {
                 getPackageLabel(
                     it.proxy!!.packageName!!,
-                    UserHandle.getUserHandleForUid(it.proxy.uid))
+                    UserHandle.getUserHandleForUid(it.proxy.uid)
+                )
             }
 
     /** Returns the attribution label for the permission access, if any. */
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageViewModel.kt
index fa5b1b685..fc8deab79 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageViewModel.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageViewModel.kt
@@ -22,6 +22,7 @@ import android.app.role.RoleManager
 import android.os.Build
 import android.os.Bundle
 import android.os.UserHandle
+import android.os.UserManager
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.AbstractSavedStateViewModelFactory
 import androidx.lifecycle.AndroidViewModel
@@ -55,6 +56,8 @@ class PermissionUsageViewModel(
     private val state: SavedStateHandle,
     app: Application,
 ) : AndroidViewModel(app) {
+    private val userManager =
+        Utils.getSystemServiceSafe(app.applicationContext, UserManager::class.java)
     private val roleManager =
         Utils.getSystemServiceSafe(app.applicationContext, RoleManager::class.java)
     private val exemptedPackages: Set<String> = Utils.getExemptedPackages(roleManager)
@@ -114,7 +117,10 @@ class PermissionUsageViewModel(
         }
 
         val eligibleLightPackageOpsList: List<LightPackageOps> =
-            getAllLightPackageOps()?.filterOutExemptedApps() ?: listOf()
+            getAllLightPackageOps()?.filterOutExemptedApps()?.filter {
+                Utils.shouldShowInSettings(it.userHandle, userManager)
+            }
+                ?: listOf()
 
         for (lightPackageOps: LightPackageOps in eligibleLightPackageOpsList) {
             val permGroupsToLastAccess: List<Map.Entry<String, Long>> =
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java
index 2c36c0adc..dffc49aa2 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java
@@ -68,6 +68,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.PermissionGroupInfo;
 import android.content.pm.PermissionInfo;
 import android.content.pm.ResolveInfo;
+import android.content.pm.UserProperties;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.graphics.Bitmap;
@@ -1591,4 +1592,30 @@ public final class Utils {
             @NonNull ApplicationInfo applicationInfo) {
         return context.getPackageManager().getApplicationLabel(applicationInfo).toString();
     }
+
+    /**
+     * Returns whether the given user should be shown in the Settings UI in SdkLevel V+. This method
+     * will always return true for SdkLevels below V.
+     *
+     * @param userHandle The user for which to check whether it should be shown or not.
+     * @return true if it should be shown, false otherwise.
+     */
+    public static boolean shouldShowInSettings(UserHandle userHandle, UserManager userManager) {
+        return !SdkLevel.isAtLeastV() || shouldShowInSettingsInternal(userHandle, userManager);
+    }
+
+    /**
+     * Returns whether the given user should be shown in the Settings UI.
+     *
+     * @param userHandle The user for which to check whether it should be shown or not.
+     * @return true if it should be shown, false otherwise.
+     */
+    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
+    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.VANILLA_ICE_CREAM)
+    private static boolean shouldShowInSettingsInternal(
+            UserHandle userHandle, UserManager userManager) {
+        var userProperties = userManager.getUserProperties(userHandle);
+        return !userManager.isQuietModeEnabled(userHandle)
+                || userProperties.getShowInQuietMode() != UserProperties.SHOW_IN_QUIET_MODE_HIDDEN;
+    }
 }