diff options
3 files changed, 11 insertions, 7 deletions
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsScaffold.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsScaffold.kt index 1af4ce7553d8..d17e4645ee5e 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsScaffold.kt +++ b/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, diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfoPage.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfoPage.kt index 4f88398b9550..8b19c5b0e319 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfoPage.kt +++ b/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() diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt index 1bbc47d604d3..e8b046aa4860 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppInfoPage.kt +++ b/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 { |