diff options
author | Sebastián Franco <fransebas@google.com> | 2022-09-23 15:19:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-09-23 15:19:43 +0000 |
commit | 8c158770d7e4e5189cbeffa03592c7468649c303 (patch) | |
tree | ffe1a177e4ba840fd83ca55c4deb6b803b3f5964 | |
parent | d859a200869dfa0807ee9e7da61ebf414bc65e99 (diff) | |
parent | e7c222cdb528685d56a8f8c8ca540df4ba9c758d (diff) | |
download | Launcher3-8c158770d7e4e5189cbeffa03592c7468649c303.tar.gz |
Merge "Check for null when calling getCreatedActivity which is marked as Nullable" into tm-qpr-dev
-rw-r--r-- | quickstep/src/com/android/quickstep/OverviewCommandHelper.java | 7 |
1 files 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(); } |