From 5b97b40eb1be1489bef93acc965f1f019afc4cc6 Mon Sep 17 00:00:00 2001 From: vadimt Date: Thu, 14 Jan 2021 13:42:35 -0800 Subject: [PATCH] Skipping QS metrics if activity is not created Test: presubmit Bug: 177472265 Change-Id: Ic92adbe589736d16ab8687ea761c32919d8c186b --- .../src/com/android/quickstep/OverviewCommandHelper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java index ec6e303830..985389ea7d 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java @@ -175,9 +175,12 @@ public class OverviewCommandHelper { return; } - InteractionJankMonitorWrapper.begin( - mActivityInterface.getCreatedActivity().getRootView(), - InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH); + final T activity = mActivityInterface.getCreatedActivity(); + if (activity != null) { + InteractionJankMonitorWrapper.begin( + activity.getRootView(), + InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH); + } // Otherwise, start overview. mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);