e32aa4fd2b22b5caa75826dc4ec086d1eb7b832e - platform_frameworks_base

commit	e32aa4fd2b22b5caa75826dc4ec086d1eb7b832e	[log] [tgz]
author	Chris Li <lihongyu@google.com>	Tue Nov 02 16:36:56 2021 +0800
committer	Chris Li <lihongyu@google.com>	Mon Nov 08 10:57:18 2021 +0800
tree	673f135d1a071ebd14bb4e25ed7ec8a99ad38981
parent	8f7d253431b896f5025f945d490611eda5cc885f [diff]

Fix NPE for animate frozen snapshot

Before, the snapshot can be null if the window is unfreezed but not
removed from the display changing list, or when it fails to take
screenshot (like because the display is not ready). Now, we make sure to
remove the window from the changing list in such cases.

Fix: 204400505
Test: atest WmTests:WindowContainerTests
Change-Id: I517232fc2ec689680a00b499495a4bad5a0d5f15

services/core/java/com/android/server/wm/SurfaceAnimator.java[diff]
services/core/java/com/android/server/wm/SurfaceFreezer.java[diff]
services/core/java/com/android/server/wm/WindowContainer.java[diff]
services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java[diff]
services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java[diff]

7 files changed