From 3bb1c1c125f89b80d53615923db8a103202832c3 Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Thu, 20 Apr 2023 14:20:36 -0700 Subject: [PATCH] Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null This change is needed because of ag/22360314 Fix: 277964328 Test: Compiles Change-Id: Ib03bbf9d60b2a2b0a8207d3ba2a4c1019cc1b8f7 --- quickstep/src/com/android/quickstep/SystemUiProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 512d47e6c7..fdb30cedf3 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -967,7 +967,7 @@ public class SystemUiProxy implements ISystemUiProxy { IRemoteAnimationRunner runner) { mBackToLauncherCallback = callback; mBackToLauncherRunner = runner; - if (mBackAnimation == null) { + if (mBackAnimation == null || mBackToLauncherCallback == null) { return; } try {