Snap for 11041982 from 17440e9d4d86da90a850ad04dbc41cb59d30cdec to mainline-uwb-releaseaml_uwb_341310300aml_uwb_341310030android14-mainline-uwb-release

Change-Id: If31740c980b44eae1671d1a80e4f088e8f9ef7e4

9 files changed, 165 insertions, 125 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java
index 2de936469..d3a89c3ed 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java
@@ -418,7 +418,7 @@ public class AutoAppPermissionFragment extends AutoSettingsFrameFragment
             // TODO(b/229024576): This code is duplicated, refactor ConfirmDialog for easier
             // NFF sharing
             boolean isGrantFileAccess = getArguments().getSerializable(CHANGE_REQUEST)
-                    == ChangeRequest.GRANT_All_FILE_ACCESS;
+                    == ChangeRequest.GRANT_ALL_FILE_ACCESS;
             boolean isGrantStorageSupergroup = getArguments().getSerializable(CHANGE_REQUEST)
                     == ChangeRequest.GRANT_STORAGE_SUPERGROUP;
             int positiveButtonStringResId = R.string.grant_dialog_button_deny_anyway;
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoDividerPreference.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoDividerPreference.kt
index aa3c7ffd7..7bb4ccb05 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoDividerPreference.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoDividerPreference.kt
@@ -20,9 +20,7 @@ import android.util.AttributeSet
 import androidx.preference.Preference
 import com.android.permissioncontroller.R
 
-/**
- * Non-interactive preference that displays a horizontal divider.
- */
+/** Non-interactive preference that displays a horizontal divider. */
 class AutoDividerPreference : Preference {
     constructor(
         context: Context?,
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoPermissionAppsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoPermissionAppsFragment.java
index 29fcb43b2..3b8419bcf 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoPermissionAppsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoPermissionAppsFragment.java
@@ -22,6 +22,7 @@ import static com.android.permissioncontroller.permission.ui.Category.ALLOWED;
 import static com.android.permissioncontroller.permission.ui.Category.ALLOWED_FOREGROUND;
 import static com.android.permissioncontroller.permission.ui.Category.ASK;
 import static com.android.permissioncontroller.permission.ui.Category.DENIED;
+import static com.android.permissioncontroller.permission.ui.Category.STORAGE_FOOTER;
 import static com.android.permissioncontroller.permission.ui.ManagePermissionsActivity.EXTRA_CALLER_NAME;
 
 import android.content.Context;
@@ -52,15 +53,15 @@ import com.android.permissioncontroller.permission.utils.KotlinUtils;
 import com.android.permissioncontroller.permission.utils.Utils;
 import com.android.settingslib.utils.applications.AppUtils;
 
+import kotlin.Pair;
+import kotlin.Triple;
+
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import kotlin.Pair;
-import kotlin.Triple;
-
 /** Shows the list of applications which have (or do not have) the given permission. */
 public class AutoPermissionAppsFragment extends AutoSettingsFrameFragment implements
         PermissionUsages.PermissionsUsagesChangeCallback {
@@ -172,6 +173,10 @@ public class AutoPermissionAppsFragment extends AutoSettingsFrameFragment implem
         }
         // Hide allowed foreground label by default, to avoid briefly showing it before updating
         findPreference(ALLOWED_FOREGROUND.getCategoryName()).setVisible(false);
+
+        // Hide storage footer category
+        findPreference(STORAGE_FOOTER.getCategoryName()).setVisible(false);
+
         Context context = getPreferenceManager().getContext();
 
         if (context == null || getActivity() == null || categories == null) {
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsFragment.kt
index 92917a342..99f5c85e4 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsFragment.kt
@@ -53,20 +53,19 @@ class AutoReviewPermissionDecisionsFragment : AutoSettingsFrameFragment() {
         private const val LOG_TAG = "AutoReviewPermissionDecisionsFragment"
         private const val MAX_DECISIONS = 3
 
-        /**
-         * Creates a new instance of [AutoReviewPermissionDecisionsFragment].
-         */
+        /** Creates a new instance of [AutoReviewPermissionDecisionsFragment]. */
         fun newInstance(
             sessionId: Long,
             userHandle: UserHandle,
             source: String?
         ): AutoReviewPermissionDecisionsFragment {
             return AutoReviewPermissionDecisionsFragment().apply {
-                arguments = Bundle().apply {
-                    putLong(Constants.EXTRA_SESSION_ID, sessionId)
-                    putParcelable(Intent.EXTRA_USER, userHandle)
-                    putString(EXTRA_SOURCE, source)
-                }
+                arguments =
+                    Bundle().apply {
+                        putLong(Constants.EXTRA_SESSION_ID, sessionId)
+                        putParcelable(Intent.EXTRA_USER, userHandle)
+                        putString(EXTRA_SOURCE, source)
+                    }
             }
         }
     }
@@ -95,21 +94,23 @@ class AutoReviewPermissionDecisionsFragment : AutoSettingsFrameFragment() {
         }
         user = requireArguments().getParcelable<UserHandle>(Intent.EXTRA_USER)!!
         sessionId = requireArguments().getLong(Constants.EXTRA_SESSION_ID)
-        if (requireArguments().containsKey(EXTRA_SOURCE) &&
-            (requireArguments().getString(EXTRA_SOURCE) == EXTRA_SOURCE_NOTIFICATION)) {
+        if (
+            requireArguments().containsKey(EXTRA_SOURCE) &&
+                (requireArguments().getString(EXTRA_SOURCE) == EXTRA_SOURCE_NOTIFICATION)
+        ) {
             logDecisionReminderNotificationClicked()
         }
-        val factory = ReviewPermissionDecisionsViewModelFactory(
-            requireActivity().getApplication()!!, user)
-        viewModel = ViewModelProvider(this,
-            factory)[ReviewPermissionDecisionsViewModel::class.java]
+        val factory =
+            ReviewPermissionDecisionsViewModelFactory(requireActivity().getApplication()!!, user)
+        viewModel = ViewModelProvider(this, factory)[ReviewPermissionDecisionsViewModel::class.java]
 
         addPrivacyDashboardPreference()
         addPermissionManagerPreference()
         preferenceScreen.addPreference(AutoDividerPreference(context))
-        recentPermissionsGroup = PreferenceCategory(context!!).apply {
-            title = getString(R.string.review_permission_decisions)
-        }
+        recentPermissionsGroup =
+            PreferenceCategory(context!!).apply {
+                title = getString(R.string.review_permission_decisions)
+            }
         preferenceScreen.addPreference(recentPermissionsGroup)
 
         viewModel.recentPermissionDecisionsLiveData.observe(this) { recentDecisions ->
@@ -138,34 +139,43 @@ class AutoReviewPermissionDecisionsFragment : AutoSettingsFrameFragment() {
     }
 
     private fun addPrivacyDashboardPreference() {
-        val preference = CarUiPreference(context).apply {
-            title = getString(R.string.permission_usage_title)
-            summary = getString(R.string.auto_permission_usage_summary)
-            onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                val intent = Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE).apply {
-                    putExtra(Constants.EXTRA_SESSION_ID, sessionId)
-                }
-                startActivity(intent)
-                true
+        val preference =
+            CarUiPreference(context).apply {
+                title = getString(R.string.permission_usage_title)
+                summary = getString(R.string.auto_permission_usage_summary)
+                onPreferenceClickListener =
+                    Preference.OnPreferenceClickListener { _ ->
+                        val intent =
+                            Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE).apply {
+                                putExtra(Constants.EXTRA_SESSION_ID, sessionId)
+                            }
+                        startActivity(intent)
+                        true
+                    }
             }
-        }
         preferenceScreen.addPreference(preference)
     }
 
     private fun addPermissionManagerPreference() {
-        val preference = CarUiPreference(context).apply {
-            title = getString(R.string.app_permission_manager)
-            summary = getString(R.string.auto_permission_manager_summary)
-            onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                val intent = Intent(Intent.ACTION_MANAGE_PERMISSIONS).apply {
-                    putExtra(Intent.EXTRA_USER, user)
-                    putExtra(ManagePermissionsActivity.EXTRA_CALLER_NAME, javaClass.name)
-                    putExtra(Constants.EXTRA_SESSION_ID, sessionId)
-                }
-                startActivity(intent)
-                true
+        val preference =
+            CarUiPreference(context).apply {
+                title = getString(R.string.app_permission_manager)
+                summary = getString(R.string.auto_permission_manager_summary)
+                onPreferenceClickListener =
+                    Preference.OnPreferenceClickListener { _ ->
+                        val intent =
+                            Intent(Intent.ACTION_MANAGE_PERMISSIONS).apply {
+                                putExtra(Intent.EXTRA_USER, user)
+                                putExtra(
+                                    ManagePermissionsActivity.EXTRA_CALLER_NAME,
+                                    javaClass.name
+                                )
+                                putExtra(Constants.EXTRA_SESSION_ID, sessionId)
+                            }
+                        startActivity(intent)
+                        true
+                    }
             }
-        }
         preferenceScreen.addPreference(preference)
     }
 
@@ -175,46 +185,57 @@ class AutoReviewPermissionDecisionsFragment : AutoSettingsFrameFragment() {
     ) {
         for (i in 0 until min(recentDecisions.size, MAX_DECISIONS)) {
             val recentDecision = recentDecisions[i]
-            val decisionPreference = CarUiPreference(context).apply {
-                icon = viewModel.getAppIcon(recentDecision.packageName)
-                title = viewModel.createPreferenceTitle(recentDecision)
-                summary = viewModel.createSummaryText(recentDecision)
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    viewModel.createManageAppPermissionIntent(recentDecision).also {
-                        startActivity(it)
-                    }
-                    logPermissionDecisionClicked(recentDecision.packageName,
-                        recentDecision.permissionGroupName)
-                    true
+            val decisionPreference =
+                CarUiPreference(context).apply {
+                    icon = viewModel.getAppIcon(recentDecision.packageName)
+                    title = viewModel.createPreferenceTitle(recentDecision)
+                    summary = viewModel.createSummaryText(recentDecision)
+                    onPreferenceClickListener =
+                        Preference.OnPreferenceClickListener {
+                            viewModel.createManageAppPermissionIntent(recentDecision).also {
+                                startActivity(it)
+                            }
+                            logPermissionDecisionClicked(
+                                recentDecision.packageName,
+                                recentDecision.permissionGroupName
+                            )
+                            true
+                        }
                 }
-            }
             preferenceGroup.addPreference(decisionPreference)
         }
     }
 
     private fun addViewAllPreference(preferenceGroup: PreferenceGroup) {
         val viewAllIcon = requireContext().getDrawable(R.drawable.car_ic_apps)
-        val preference = CarUiPreference(context).apply {
-            icon = Utils.applyTint(context, viewAllIcon, android.R.attr.colorControlNormal)
-            title = getString(R.string.review_permission_decisions_view_all)
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                val frag = AutoReviewPermissionDecisionsViewAllFragment.newInstance(sessionId,
-                    user)
-                getParentFragmentManager().beginTransaction()
-                    .replace(android.R.id.content, frag)
-                    .addToBackStack(null)
-                    .commit()
-                logViewAllClicked()
-                true
+        val preference =
+            CarUiPreference(context).apply {
+                icon = Utils.applyTint(context, viewAllIcon, android.R.attr.colorControlNormal)
+                title = getString(R.string.review_permission_decisions_view_all)
+                onPreferenceClickListener =
+                    Preference.OnPreferenceClickListener {
+                        val frag =
+                            AutoReviewPermissionDecisionsViewAllFragment.newInstance(
+                                sessionId,
+                                user
+                            )
+                        getParentFragmentManager()
+                            .beginTransaction()
+                            .replace(android.R.id.content, frag)
+                            .addToBackStack(null)
+                            .commit()
+                        logViewAllClicked()
+                        true
+                    }
             }
-        }
         preferenceGroup.addPreference(preference)
     }
 
     private fun addNoRecentDecisionsPreference(preferenceGroup: PreferenceGroup) {
-        val preference = CarUiPreference(context).apply {
-            title = getString(R.string.review_permission_decisions_empty)
-        }
+        val preference =
+            CarUiPreference(context).apply {
+                title = getString(R.string.review_permission_decisions_empty)
+            }
         preferenceGroup.addPreference(preference)
     }
 
@@ -224,7 +245,8 @@ class AutoReviewPermissionDecisionsFragment : AutoSettingsFrameFragment() {
             sessionId,
             RECENT_PERMISSION_DECISIONS_INTERACTED__ACTION__SCREEN_VIEWED,
             0,
-            null)
+            null
+        )
     }
 
     private fun logViewAllClicked() {
@@ -233,7 +255,8 @@ class AutoReviewPermissionDecisionsFragment : AutoSettingsFrameFragment() {
             sessionId,
             RECENT_PERMISSION_DECISIONS_INTERACTED__ACTION__VIEW_ALL_CLICKED,
             0,
-            null)
+            null
+        )
     }
 
     private fun logPermissionDecisionClicked(packageName: String, permissionGroupName: String) {
@@ -243,12 +266,15 @@ class AutoReviewPermissionDecisionsFragment : AutoSettingsFrameFragment() {
             sessionId,
             RECENT_PERMISSION_DECISIONS_INTERACTED__ACTION__REVIEW_DECISION,
             uid,
-            permissionGroupName)
+            permissionGroupName
+        )
     }
 
     private fun logDecisionReminderNotificationClicked() {
         PermissionControllerStatsLog.write(
             PermissionControllerStatsLog.PERMISSION_REMINDER_NOTIFICATION_INTERACTED,
-            sessionId, PERMISSION_REMINDER_NOTIFICATION_INTERACTED__RESULT__NOTIFICATION_CLICKED)
+            sessionId,
+            PERMISSION_REMINDER_NOTIFICATION_INTERACTED__RESULT__NOTIFICATION_CLICKED
+        )
     }
 }
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsViewAllFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsViewAllFragment.kt
index 9f9471fdf..11cca4693 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsViewAllFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoReviewPermissionDecisionsViewAllFragment.kt
@@ -39,18 +39,17 @@ class AutoReviewPermissionDecisionsViewAllFragment : AutoSettingsFrameFragment()
     companion object {
         private const val LOG_TAG = "AutoReviewPermissionDecisionsViewAllFragment"
 
-        /**
-         * Creates a new instance of [AutoReviewPermissionDecisionsViewAllFragment].
-         */
+        /** Creates a new instance of [AutoReviewPermissionDecisionsViewAllFragment]. */
         fun newInstance(
             sessionId: Long,
             userHandle: UserHandle
         ): AutoReviewPermissionDecisionsViewAllFragment {
             return AutoReviewPermissionDecisionsViewAllFragment().apply {
-                arguments = Bundle().apply {
-                    putLong(Constants.EXTRA_SESSION_ID, sessionId)
-                    putParcelable(Intent.EXTRA_USER, userHandle)
-                }
+                arguments =
+                    Bundle().apply {
+                        putLong(Constants.EXTRA_SESSION_ID, sessionId)
+                        putParcelable(Intent.EXTRA_USER, userHandle)
+                    }
             }
         }
     }
@@ -71,10 +70,9 @@ class AutoReviewPermissionDecisionsViewAllFragment : AutoSettingsFrameFragment()
             return
         }
         user = requireArguments().getParcelable<UserHandle>(Intent.EXTRA_USER)!!
-        val factory = ReviewPermissionDecisionsViewModelFactory(
-            requireActivity().getApplication()!!, user)
-        viewModel = ViewModelProvider(this,
-            factory)[ReviewPermissionDecisionsViewModel::class.java]
+        val factory =
+            ReviewPermissionDecisionsViewModelFactory(requireActivity().getApplication()!!, user)
+        viewModel = ViewModelProvider(this, factory)[ReviewPermissionDecisionsViewModel::class.java]
         viewModel.recentPermissionDecisionsLiveData.observe(this) { recentDecisions ->
             onRecentDecisionsChanged(recentDecisions)
         }
@@ -88,17 +86,19 @@ class AutoReviewPermissionDecisionsViewAllFragment : AutoSettingsFrameFragment()
     private fun onRecentDecisionsChanged(recentDecisions: List<PermissionDecision>) {
         preferenceScreen.removeAll()
         for (recentDecision in recentDecisions) {
-            val decisionPreference = CarUiPreference(context).apply {
-                icon = viewModel.getAppIcon(recentDecision.packageName)
-                title = viewModel.createPreferenceTitle(recentDecision)
-                summary = viewModel.createSummaryText(recentDecision)
-                onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                    viewModel.createManageAppPermissionIntent(recentDecision).also {
-                        startActivity(it)
-                    }
-                    false
+            val decisionPreference =
+                CarUiPreference(context).apply {
+                    icon = viewModel.getAppIcon(recentDecision.packageName)
+                    title = viewModel.createPreferenceTitle(recentDecision)
+                    summary = viewModel.createSummaryText(recentDecision)
+                    onPreferenceClickListener =
+                        Preference.OnPreferenceClickListener {
+                            viewModel.createManageAppPermissionIntent(recentDecision).also {
+                                startActivity(it)
+                            }
+                            false
+                        }
                 }
-            }
             preferenceScreen.addPreference(decisionPreference)
         }
     }
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt
index 61f77c81a..d798291e0 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt
@@ -30,16 +30,14 @@ import com.android.permissioncontroller.hibernation.isHibernationEnabled
 import com.android.permissioncontroller.permission.ui.UnusedAppsFragment
 import com.android.permissioncontroller.permission.ui.UnusedAppsFragment.Companion.INFO_MSG_CATEGORY
 
-/**
- * Auto wrapper, with customizations, around [UnusedAppsFragment].
- */
-class AutoUnusedAppsFragment : AutoSettingsFrameFragment(),
-    UnusedAppsFragment.Parent<AutoUnusedAppsPreference> {
+/** Auto wrapper, with customizations, around [UnusedAppsFragment]. */
+class AutoUnusedAppsFragment :
+    AutoSettingsFrameFragment(), UnusedAppsFragment.Parent<AutoUnusedAppsPreference> {
 
     companion object {
         private const val UNUSED_PREFERENCE_KEY = "unused_pref_row_key"
 
-        /** Create a new instance of this fragment.  */
+        /** Create a new instance of this fragment. */
         @JvmStatic
         fun newInstance(): AutoUnusedAppsFragment {
             return AutoUnusedAppsFragment()
@@ -53,15 +51,12 @@ class AutoUnusedAppsFragment : AutoSettingsFrameFragment(),
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (savedInstanceState == null) {
-            val fragment:
-                UnusedAppsFragment<AutoUnusedAppsFragment, AutoUnusedAppsPreference> =
+            val fragment: UnusedAppsFragment<AutoUnusedAppsFragment, AutoUnusedAppsPreference> =
                 UnusedAppsFragment.newInstance()
             fragment.arguments = arguments
             // child fragment does not have its own UI - it will add to the preferences of this
             // parent fragment
-            childFragmentManager.beginTransaction()
-                .add(fragment, null)
-                .commit()
+            childFragmentManager.beginTransaction().add(fragment, null).commit()
         }
 
         // initially focus on focus parking view and then shift focus to recyclerview once it has
@@ -76,10 +71,12 @@ class AutoUnusedAppsFragment : AutoSettingsFrameFragment(),
         if (isHibernationEnabled()) {
             preference.summary = getString(R.string.unused_apps_page_summary)
         } else {
-            preference.summary = """
+            preference.summary =
+                """
             ${getString(R.string.auto_revoked_apps_page_summary)}
             ${getString(R.string.auto_revoke_open_app_message)}
-            """.trimIndent()
+            """
+                    .trimIndent()
         }
         preference.setIcon(R.drawable.ic_info_outline)
         preference.isSelectable = false
@@ -104,9 +101,9 @@ class AutoUnusedAppsFragment : AutoSettingsFrameFragment(),
 
     override fun setEmptyState(empty: Boolean) {
         val infoMsgCategory =
-                preferenceScreen.findPreference<PreferenceCategory>(INFO_MSG_CATEGORY)!!
+            preferenceScreen.findPreference<PreferenceCategory>(INFO_MSG_CATEGORY)!!
         val noUnusedAppsPreference: Preference? =
-                infoMsgCategory.findPreference<Preference>(UNUSED_PREFERENCE_KEY)
+            infoMsgCategory.findPreference<Preference>(UNUSED_PREFERENCE_KEY)
         if (empty && noUnusedAppsPreference == null) {
             infoMsgCategory.addPreference(createNoUnusedAppsPreference())
         } else if (noUnusedAppsPreference != null) {
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsPreference.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsPreference.kt
index 9835a90f4..f1b65b38f 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsPreference.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsPreference.kt
@@ -52,4 +52,4 @@ class AutoUnusedAppsPreference(
     override fun setRemoveComponentEnabled(enabled: Boolean) {
         setSecondaryActionEnabled(enabled)
     }
-}
\ No newline at end of file
+}
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionHistoryPreference.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionHistoryPreference.kt
index 7ea400127..08460178c 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionHistoryPreference.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionHistoryPreference.kt
@@ -23,8 +23,8 @@ import androidx.annotation.RequiresApi
 import androidx.preference.Preference.OnPreferenceClickListener
 import com.android.car.ui.preference.CarUiPreference
 import com.android.permissioncontroller.R
-import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel
 import com.android.permissioncontroller.permission.ui.legacy.PermissionUsageDetailsViewModelLegacy
+import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel
 
 /** Preference that displays a permission usage for an app. */
 @RequiresApi(Build.VERSION_CODES.S)
@@ -40,7 +40,8 @@ class AutoPermissionHistoryPreference(
                 context.getString(
                     R.string.auto_permission_usage_timeline_summary,
                     DateFormat.getTimeFormat(context).format(historyPreferenceData.accessEndTime),
-                    historyPreferenceData.summaryText)
+                    historyPreferenceData.summaryText
+                )
             } else {
                 DateFormat.getTimeFormat(context).format(historyPreferenceData.accessEndTime)
             }
@@ -60,7 +61,9 @@ class AutoPermissionHistoryPreference(
                     accessEndTime = historyPreferenceData.accessEndTime,
                     accessStartTime = historyPreferenceData.accessStartTime,
                     showingAttribution = historyPreferenceData.showingAttribution,
-                    attributionTags = historyPreferenceData.attributionTags))
+                    attributionTags = historyPreferenceData.attributionTags
+                )
+            )
             true
         }
     }
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageFragment.kt
index d4a2a073e..c11129514 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageFragment.kt
@@ -38,11 +38,11 @@ import com.android.permissioncontroller.permission.model.livedatatypes.PermGroup
 import com.android.permissioncontroller.permission.model.v31.AppPermissionUsage
 import com.android.permissioncontroller.permission.model.v31.PermissionUsages
 import com.android.permissioncontroller.permission.model.v31.PermissionUsages.PermissionsUsagesChangeCallback
-import com.android.permissioncontroller.permission.ui.model.ManagePermissionsViewModel
-import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageControlPreferenceUtils
 import com.android.permissioncontroller.permission.ui.legacy.PermissionUsageViewModelFactoryLegacy
 import com.android.permissioncontroller.permission.ui.legacy.PermissionUsageViewModelLegacy
 import com.android.permissioncontroller.permission.ui.legacy.PermissionUsageViewModelLegacy.PermissionGroupWithUsageCount
+import com.android.permissioncontroller.permission.ui.model.ManagePermissionsViewModel
+import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageControlPreferenceUtils
 import com.android.permissioncontroller.permission.utils.Utils
 
 @RequiresApi(Build.VERSION_CODES.S)
@@ -95,7 +95,9 @@ class AutoPermissionUsageFragment : AutoSettingsFrameFragment(), PermissionsUsag
                 PermissionUsageViewModelLegacy::class.java]
 
         managePermissionsViewModel.standardPermGroupsLiveData.observe(
-            this, this::onPermissionGroupsChanged)
+            this,
+            this::onPermissionGroupsChanged
+        )
         setLoading(true)
         reloadData()
     }
@@ -119,7 +121,8 @@ class AutoPermissionUsageFragment : AutoSettingsFrameFragment(), PermissionsUsag
             PermissionControllerStatsLog.write(
                 PERMISSION_USAGE_FRAGMENT_INTERACTION,
                 sessionId,
-                PERMISSION_USAGE_FRAGMENT_INTERACTION__ACTION__SHOW_SYSTEM_CLICKED)
+                PERMISSION_USAGE_FRAGMENT_INTERACTION__ACTION__SHOW_SYSTEM_CLICKED
+            )
         }
         showSystem = !showSystem
         updateAction()
@@ -143,7 +146,10 @@ class AutoPermissionUsageFragment : AutoSettingsFrameFragment(), PermissionsUsag
     /** Reloads the data to show. */
     private fun reloadData() {
         usageViewModel.loadPermissionUsages(
-            requireActivity().getLoaderManager(), permissionUsages, this)
+            requireActivity().getLoaderManager(),
+            permissionUsages,
+            this
+        )
         if (finishedInitialLoad) {
             setLoading(false)
         }
@@ -165,7 +171,11 @@ class AutoPermissionUsageFragment : AutoSettingsFrameFragment(), PermissionsUsag
 
         val permissionUsagesUiData =
             usageViewModel.buildPermissionUsagesUiData(
-                appPermissionUsages, show7Days, showSystem, requireContext())
+                appPermissionUsages,
+                show7Days,
+                showSystem,
+                requireContext()
+            )
         val permissionApps = permissionUsagesUiData.permissionApps
         val displayShowSystemToggle = permissionUsagesUiData.displayShowSystemToggle
 
@@ -213,7 +223,8 @@ class AutoPermissionUsageFragment : AutoSettingsFrameFragment(), PermissionsUsag
                         count,
                         showSystem,
                         sessionId,
-                        show7Days)
+                        show7Days
+                    )
                     getPreferenceScreen().addPreference(permissionUsagePreference)
                 }
                 finishedInitialLoad = true