Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I9355c44d196061398015858c96f51bc78f8e4374
Change-Id: I26b18315958b277873976b15c2f6d4119c5639bc

1 files changed, 4 insertions, 5 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/CollapsableGroupCardHelper.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/CollapsableGroupCardHelper.kt
index cdc5cc1f3..20ac4c7a5 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/CollapsableGroupCardHelper.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/CollapsableGroupCardHelper.kt
@@ -27,7 +27,7 @@ internal class CollapsableGroupCardHelper {
 
     private companion object {
         private const val EXPANDED_ENTRY_GROUPS_SAVED_INSTANCE_STATE_KEY =
-                "expanded_entry_groups_saved_instance_state_key"
+            "expanded_entry_groups_saved_instance_state_key"
     }
 
     fun restoreState(state: Bundle?) {
@@ -39,8 +39,8 @@ internal class CollapsableGroupCardHelper {
 
     fun saveState(outState: Bundle) {
         outState.putCharSequenceArray(
-                EXPANDED_ENTRY_GROUPS_SAVED_INSTANCE_STATE_KEY,
-                expandedGroups.toTypedArray()
+            EXPANDED_ENTRY_GROUPS_SAVED_INSTANCE_STATE_KEY,
+            expandedGroups.toTypedArray()
         )
     }
 
@@ -52,6 +52,5 @@ internal class CollapsableGroupCardHelper {
         expandedGroups.add(groupId)
     }
 
-    fun isGroupExpanded(groupId: CharSequence): Boolean =
-        expandedGroups.contains(groupId)
+    fun isGroupExpanded(groupId: CharSequence): Boolean = expandedGroups.contains(groupId)
 }