Merge "Fix crash when trying to dismiss dialog" into tm-qpr-dev (0bfdbbf4) · Commits · e / os / android_frameworks_base

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
		@@ -85,9 +86,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)