Merge "Fix SpaLib build after Compose 1.3.0"

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsScaffold.kt

@@ -61,6 +61,7 @@ fun SettingsScaffold(
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun settingsTopAppBarColors() = TopAppBarDefaults.largeTopAppBarColors(
     containerColor = SettingsTheme.colorScheme.surfaceHeader,

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfoPage.kt

@@ -32,10 +32,11 @@ fun AppInfoPage(
 ) {
     RegularScaffold(title = title) {
         val appInfoProvider = remember {
-            val packageInfo = PackageManagers.getPackageInfoAsUser(packageName, userId)
-                ?: return@RegularScaffold
-            AppInfoProvider(packageInfo)
-        }
+            PackageManagers.getPackageInfoAsUser(packageName, userId)?.let { packageInfo ->
+                AppInfoProvider(packageInfo)
+            }
+        } ?: return@RegularScaffold
+
         appInfoProvider.AppInfo(displayVersion = true)
 
         content()

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt

@@ -143,9 +143,11 @@ private fun <T : AppRecord> createSwitchModel(
     userId: Int,
 ): TogglePermissionSwitchModel<T>? {
     val record = remember {
-        val app = PackageManagers.getApplicationInfoAsUser(packageName, userId) ?: return null
-        listModel.transformItem(app)
-    }
+        PackageManagers.getApplicationInfoAsUser(packageName, userId)?.let { app ->
+            listModel.transformItem(app)
+        }
+    } ?: return null
+
     val context = LocalContext.current
     val isAllowed = listModel.isAllowed(record)
     return remember {