commit 89eb36405d6760e5d6d1b2b349c455a5f0e657a4
author Winson Chung <winsonc@google.com> Thu Oct 17 12:01:58 2019 -0700
committer Winson Chung <winsonc@google.com> Thu Oct 17 12:01:58 2019 -0700
tree 70afd4c02ae1b47a33dd421f6e9c0c5715f9cac9
parent 35903d2cb25a4c941d97e26746d6d3f74c5fd5e7

Skip setting the deferred launch callback if activity is already destroyed

Bug: 141886704
Change-Id: Iaa151335e5a3994a46406df399f2d159afe2c75e

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
index 87db83d..4406314 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java
@@ -515,6 +515,9 @@
 
     @Override
     public void setOnDeferredActivityLaunchCallback(Runnable r) {
-        getCreatedActivity().setOnDeferredActivityLaunchCallback(r);
+        Launcher launcher = getCreatedActivity();
+        if (launcher != null) {
+            launcher.setOnDeferredActivityLaunchCallback(r);
+        }
     }
 }
\ No newline at end of file