diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt index 4ab09185fcdd..9e622801a01b 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt @@ -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) { |