From e7c222cdb528685d56a8f8c8ca540df4ba9c758d Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Thu, 22 Sep 2022 11:10:50 -0500 Subject: [PATCH] Check for null when calling getCreatedActivity which is marked as Nullable Fix: 243508135 Test: compiles Change-Id: Id1ff2cf68fa10690a1bbec60a0c17cceab9db8d1 --- .../src/com/android/quickstep/OverviewCommandHelper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java index 57a26ee8ba..875b72cb34 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java @@ -240,8 +240,11 @@ public class OverviewCommandHelper { interactionHandler.onGestureCancelled(); cmd.removeListener(this); - RecentsView createdRecents = - activityInterface.getCreatedActivity().getOverviewPanel(); + T createdActivity = activityInterface.getCreatedActivity(); + if (createdActivity == null) { + return; + } + RecentsView createdRecents = createdActivity.getOverviewPanel(); if (createdRecents != null) { createdRecents.onRecentsAnimationComplete(); }