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

Commit 3671f67e authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when trying to dismiss dialog" am: 3023a334 am: cea2abb7 am: 68642fbc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2229977



Change-Id: I5b78b9e44168ad7cfccfda59d10a72d2bed0e24e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2dbefde9 68642fbc

packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt

+11 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.controls.ui 


import android.annotation.AnyThread

import android.annotation.MainThread

import android.app.Activity

import android.app.AlertDialog

import android.app.Dialog

import android.app.PendingIntent
@@ -119,9 +120,17 @@ class ControlActionCoordinatorImpl @Inject constructor( 
    }



    override fun closeDialogs() {

        val isActivityFinishing =

            (activityContext as? Activity)?.let { it.isFinishing || it.isDestroyed }

        if (isActivityFinishing == true) {

            dialog = null

            return

        }

        if (dialog?.isShowing == true) {

            dialog?.dismiss()

            dialog = null

        }

    }



    override fun toggle(cvh: ControlViewHolder, templateId: String, isChecked: Boolean) {

        controlsMetricsLogger.touch(cvh, isLocked)