summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sebastian Franco <fransebas@google.com> 2021-12-30 11:51:37 -0600
committer Winson Chung <winsonc@google.com> 2022-01-05 19:54:40 +0000
commit76f9cda458b0f5b237bf6205848c811da4cb8be7 (patch)
treeec0671eee58419e76ab05f59608a3d823b04b5bd
parent5a1d0103e4e8341ac5c45e119a28e86b99ffe1ef (diff)
Quick fix for NullPointerException 211713013
Test: Manually tested Fix: 211713013 Change-Id: Ie701bee61a69d88cc9fce12c9d001a52f30578c4
-rw-r--r--packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java
index 30db13611f4a..2583e096e3c7 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java
@@ -278,7 +278,9 @@ public class RemoteAnimationTargetCompat {
* @see SurfaceControl#release()
*/
public void release() {
- leash.mSurfaceControl.release();
+ if (leash.mSurfaceControl != null) {
+ leash.mSurfaceControl.release();
+ }
if (mStartLeash != null) {
mStartLeash.release();
}