PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix kotlin nullable errors in Settings" into aosp-main-future

Browse Source
This commit is contained in:
Colin Cross
2023-09-12 18:36:47 +00:00
committed by Android (Google) Code Review
parent 81343f23fc ee87a406cd
commit f87c5f2cfc
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
View File

@@ -95,10 +95,10 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
WindowManager.LayoutParams.FLAG_SECURE WindowManager.LayoutParams.FLAG_SECURE
) )
dialog.setCanceledOnTouchOutside(false) dialog.setCanceledOnTouchOutside(false)
val textView = dialog.findViewById<TextView>(R.id.esim_id_value) val textView = dialog.requireViewById<TextView>(R.id.esim_id_value)
textView.text = PhoneNumberUtil.expandByTts(eid) textView.text = PhoneNumberUtil.expandByTts(eid)
val qrCodeView = dialog.findViewById<ImageView>(R.id.esim_id_qrcode) val qrCodeView = dialog.requireViewById<ImageView>(R.id.esim_id_qrcode)
qrCodeView.setImageBitmap(getEidQrCode(eid)) qrCodeView.setImageBitmap(getEidQrCode(eid))
// After "Tap to show", eid is displayed on preference. // After "Tap to show", eid is displayed on preference.

2
src/com/android/settings/notification/app/FullScreenIntentPermissionPreferenceController.kt
View File

@@ -81,7 +81,7 @@ class FullScreenIntentPermissionPreferenceController(
private fun isPermissionRequested(): Boolean { private fun isPermissionRequested(): Boolean {
val packageInfo = packageManager.getPackageInfo(packageName, GET_PERMISSIONS) val packageInfo = packageManager.getPackageInfo(packageName, GET_PERMISSIONS)
for (requestedPermission in packageInfo.requestedPermissions) { for (requestedPermission in packageInfo.requestedPermissions.orEmpty()) {
if (USE_FULL_SCREEN_INTENT.equals(requestedPermission)) { if (USE_FULL_SCREEN_INTENT.equals(requestedPermission)) {
return true return true
} }

2
src/com/android/settings/spa/app/appinfo/AppButtons.kt
View File

@@ -47,7 +47,7 @@ private class AppButtonsPresenter(private val packageInfoPresenter: PackageInfoP
@Composable @Composable
fun getActionButtons() = fun getActionButtons() =
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let { packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {
getActionButtons(it.applicationInfo) getActionButtons(checkNotNull(it.applicationInfo))
} ?: emptyList() } ?: emptyList()
@Composable @Composable

2
src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
View File

@@ -119,7 +119,7 @@ object AppInfoSettingsProvider : SettingsPageProvider {
private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) { private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() }) LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() })
val packageInfo = packageInfoPresenter.flow.collectAsStateWithLifecycle().value ?: return val packageInfo = packageInfoPresenter.flow.collectAsStateWithLifecycle().value ?: return
val app = packageInfo.applicationInfo val app = checkNotNull(packageInfo.applicationInfo)
RegularScaffold( RegularScaffold(
title = stringResource(R.string.application_info_label), title = stringResource(R.string.application_info_label),
actions = { actions = {

2
src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt
View File

@@ -43,7 +43,7 @@ private class CloneAppButtonsPresenter(private val packageInfoPresenter: Package
@Composable @Composable
fun getActionButtons() = fun getActionButtons() =
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let { packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {
getActionButtons(it.applicationInfo) getActionButtons(checkNotNull(it.applicationInfo))
} ?: emptyList() } ?: emptyList()
@Composable @Composable

2
src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
View File

@@ -77,7 +77,7 @@ class PackageInfoPresenter(
DisposableBroadcastReceiverAsUser(intentFilter, userHandle) { intent -> DisposableBroadcastReceiverAsUser(intentFilter, userHandle) { intent ->
if (packageName == intent.data?.schemeSpecificPart) { if (packageName == intent.data?.schemeSpecificPart) {
val packageInfo = flow.value val packageInfo = flow.value
if (packageInfo != null && packageInfo.applicationInfo.isSystemApp) { if (packageInfo != null && packageInfo.applicationInfo?.isSystemApp == true) {
// System app still exists after uninstalling the updates, refresh the page. // System app still exists after uninstalling the updates, refresh the page.
reloadPackageInfo() reloadPackageInfo()
} else { } else {