Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f87c5f2c authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

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

parents 81343f23 ee87a406

src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt

+2 −2
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) : 
            WindowManager.LayoutParams.FLAG_SECURE

        )

        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)



        val qrCodeView = dialog.findViewById<ImageView>(R.id.esim_id_qrcode)

        val qrCodeView = dialog.requireViewById<ImageView>(R.id.esim_id_qrcode)

        qrCodeView.setImageBitmap(getEidQrCode(eid))



        // After "Tap to show", eid is displayed on preference.

src/com/android/settings/notification/app/FullScreenIntentPermissionPreferenceController.kt

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ class FullScreenIntentPermissionPreferenceController( 
    private fun isPermissionRequested(): Boolean {

        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)) {

                return true

            }

src/com/android/settings/spa/app/appinfo/AppButtons.kt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ private class AppButtonsPresenter(private val packageInfoPresenter: PackageInfoP 
    @Composable

    fun getActionButtons() =

        packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {

            getActionButtons(it.applicationInfo)

            getActionButtons(checkNotNull(it.applicationInfo))

        } ?: emptyList()



    @Composable

src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ object AppInfoSettingsProvider : SettingsPageProvider { 
private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {

    LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() })

    val packageInfo = packageInfoPresenter.flow.collectAsStateWithLifecycle().value ?: return

    val app = packageInfo.applicationInfo

    val app = checkNotNull(packageInfo.applicationInfo)

    RegularScaffold(

        title = stringResource(R.string.application_info_label),

        actions = {

src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ private class CloneAppButtonsPresenter(private val packageInfoPresenter: Package 
    @Composable

    fun getActionButtons() =

        packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {

            getActionButtons(it.applicationInfo)

            getActionButtons(checkNotNull(it.applicationInfo))

        } ?: emptyList()



    @Composable