1 files changed, 34 insertions, 18 deletions

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 eeac22124..efb16ea2f 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
@@ -98,7 +98,8 @@ class PermissionUsageViewModel(
             showSystem,
             show7Days,
             mAllLightPackageOpsLiveData.containsSystemAppUsages(startTime),
-            mAllLightPackageOpsLiveData.buildPermissionGroupsWithUsageCounts(startTime, showSystem))
+            mAllLightPackageOpsLiveData.buildPermissionGroupsWithUsageCounts(startTime, showSystem)
+        )
     }
 
     /** Builds a map of permission groups to the number of apps that recently accessed them. */
@@ -119,9 +120,14 @@ class PermissionUsageViewModel(
                 lightPackageOps.lastPermissionGroupAccessTimesMs.entries
                     .filterOutExemptedPermissionGroupsFromKeys()
                     .filterOutPermissionsNotRequestedByApp(
-                        lightPackageOps.packageName, lightPackageOps.userHandle)
+                        lightPackageOps.packageName,
+                        lightPackageOps.userHandle
+                    )
                     .filterOutSystemAppPermissionsIfNecessary(
-                        showSystem, lightPackageOps.packageName, lightPackageOps.userHandle)
+                        showSystem,
+                        lightPackageOps.packageName,
+                        lightPackageOps.userHandle
+                    )
                     .filterAccessTimeLaterThan(startTime)
             val recentlyUsedPermissions: List<String> = permGroupsToLastAccess.map { it.key }
 
@@ -147,10 +153,14 @@ class PermissionUsageViewModel(
                     .filterAccessTimeLaterThan(startTime)
                     .map { it.key }
                     .toSet()
-            if (recentlyUsedPermissions
-                .filterOutExemptedPermissionGroups()
-                .containsSystemAppPermission(
-                    lightPackageOps.packageName, lightPackageOps.userHandle)) {
+            if (
+                recentlyUsedPermissions
+                    .filterOutExemptedPermissionGroups()
+                    .containsSystemAppPermission(
+                        lightPackageOps.packageName,
+                        lightPackageOps.userHandle
+                    )
+            ) {
                 return true
             }
         }
@@ -186,9 +196,11 @@ class PermissionUsageViewModel(
         // The Telecom doesn't request microphone or camera permissions. However, telecom app may
         // use these permissions and they are considered system app permissions, so we return true
         // even if the AppPermGroupUiInfo is unavailable.
-        if (appPermissionId.packageName == TELECOM_PACKAGE &&
-            (appPermissionId.permissionGroup == Manifest.permission_group.CAMERA ||
-                appPermissionId.permissionGroup == Manifest.permission_group.MICROPHONE)) {
+        if (
+            appPermissionId.packageName == TELECOM_PACKAGE &&
+                (appPermissionId.permissionGroup == Manifest.permission_group.CAMERA ||
+                    appPermissionId.permissionGroup == Manifest.permission_group.MICROPHONE)
+        ) {
             return true
         }
         return false
@@ -312,27 +324,31 @@ class PermissionUsageViewModel(
                                 packageWithUserHandle.first,
                                 packageWithUserHandle.second,
                                 permissionGroup,
-                            ))
+                            )
+                        )
                     }
                 }
 
                 setSourcesToDifference(
                     appPermissionIds,
                     appPermGroupUiInfoLiveDataList,
-                    getAppPermGroupUiInfoLiveData) {
-                        update()
-                    }
+                    getAppPermGroupUiInfoLiveData
+                ) {
+                    update()
+                }
 
                 setSourcesToDifference(
-                    allPackages, lightPackageInfoLiveDataMap, getLightPackageInfoLiveData) {
-                        update()
-                    }
+                    allPackages,
+                    lightPackageInfoLiveDataMap,
+                    getLightPackageInfoLiveData
+                ) {
+                    update()
+                }
 
                 if (lightPackageInfoLiveDataMap.any { it.value.isStale }) {
                     return
                 }
 
-
                 if (appPermGroupUiInfoLiveDataList.any { it.value.isStale }) {
                     return
                 }