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

Commit 36d7c566 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Disable screenshot shared transitions if view is not attached 

Bug: 339592239
Fix: 339592239
Flag: NONE bugfix
Test: take screenshot on lockscreen and tap a button, then dismiss
screenshot and unlock device. verify that activity shows correctly and
is visble/interactible

Change-Id: I69078208f44930b5fbdd3d31665037ef590dc6d5
parent 3d7c06c1

packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt

+9 −3
Original line number Diff line number Diff line
@@ -90,12 +90,18 @@ constructor( 
            )

        }

        systemUiProxy.dismissKeyguard()

        transitionCoordinator?.startExit()

        var transitionOptions: ActivityOptions? = null

        if (transitionCoordinator?.decor?.isAttachedToWindow == true) {

            transitionCoordinator.startExit()

            transitionOptions = options

        }



        if (user == myUserHandle()) {

            withContext(mainDispatcher) { context.startActivity(intent, options?.toBundle()) }

            withContext(mainDispatcher) {

                context.startActivity(intent, transitionOptions?.toBundle())

            }

        } else {

            launchCrossProfileIntent(user, intent, options?.toBundle())

            launchCrossProfileIntent(user, intent, transitionOptions?.toBundle())

        }



        if (overrideTransition) {