From fb54b80240cd4e5a7bbce86a9722c276053d27de Mon Sep 17 00:00:00 2001 From: Issei Suzuki Date: Thu, 5 Aug 2021 10:27:39 +0200 Subject: [PATCH] Fix jank when launching an activity from an occluding activity. Bug: 194243906 Test: manual 1. From lockscreen, double tap power to launch camera. 2. Take photo, go to filmstrip. (no jaaring app transition) 3. Go back twice to lock screen. (no flip between translucent and opaque state in the camere preview) Change-Id: I60dc38e6d9505c8bc949d30e0d84a8771b61d50a --- .../core/java/com/android/server/wm/KeyguardController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index 3208ae3aa97d4..6cef2ca1d82bc 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -372,7 +372,9 @@ class KeyguardController { // can be committed before KEYGUARD_OCCLUDE transition is handled. // Set mRequestForceTransition flag to make sure that the app transition animation // is applied for such case. - if (topActivity != null) { + // TODO(b/194243906): Fix this before enabling the remote keyguard animation. + if (WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation + && topActivity != null) { topActivity.mRequestForceTransition = true; } updateKeyguardSleepToken(DEFAULT_DISPLAY);