Merge "Quick fix for NullPointerException 211713013" into sc-v2-dev

2022-01-06 00:05:20 +00:00
parent 88cccabf2b 76f9cda458
commit b7f37cd797
1 changed files with 3 additions and 1 deletions
--- 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();
        }