| commit | b1905bdfadf393005d93613a553242eb74da50c0 | [log] [tgz] |
|---|---|---|
| author | Vadim Tryshev <vadimt@google.com> | Thu Oct 17 19:51:45 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 17 19:51:45 2019 +0000 |
| tree | b3310d6ee07465ac0b45923bba1ad43f8d4ce931 | |
| parent | 89eb36405d6760e5d6d1b2b349c455a5f0e657a4 [diff] | |
| parent | af317c78216dffd9370618df668014b5bbb6e961 [diff] |
Merge "More preparation for enabling inproc presubmits" into ub-launcher3-master
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