From 37f979b45d6fb4fe31ace72095ba6cc3472a4207 Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Tue, 29 Jun 2021 18:44:34 +0000 Subject: [PATCH] Revert "Enable remote animation for keyguard going away transition." Revert submission 14519409 Reason for revert: Regression in multiuser performance (b/192021579) Reverted Changes: I4dae426cf:Enable remote animation for keyguard going away tr... Other changes that were submitted together but hopefully do not need to be reverted here: I3e45ca52b:Continue to dismiss keyguard when the remote anima... I46879ef87:Stop animating wallpaper and non-app windows in WM... I81cf31fe6:Extend property to enable remote animation for key... Bug: 192044570 Bug: 166736690 Bug: 192021579 Bug: 191030359 Change-Id: I31b3f701e4fe3691308f71f74e5b249dc500e787 --- .../src/com/android/systemui/keyguard/KeyguardService.java | 2 +- .../core/java/com/android/server/wm/WindowManagerService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 70837385b858b..62b92cb33f5c3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -73,7 +73,7 @@ public class KeyguardService extends Service { "persist.wm.enable_remote_keyguard_animation"; private static final int sEnableRemoteKeyguardAnimation = - SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0); /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c1e29ebc47036..5f3f2bd729d98 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -444,7 +444,7 @@ public class WindowManagerService extends IWindowManager.Stub "persist.wm.enable_remote_keyguard_animation"; private static final int sEnableRemoteKeyguardAnimation = - SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0); /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY