commit 1d3d19f2e12c584dce9b593d6086b2a8601005ab
author Winson Chung <winsonc@google.com> Fri Jul 26 16:46:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 26 16:46:35 2019 +0000
tree 43cdfe40d419e67a2e381d061035fe4714f0ca5c
parent 0ef10a458d63f871dce6b41dc43664a0a525ef14
parent 5089140cdaaaf86f415c7fcd82b4b9c8779a6662

Merge "Fix NPE in service dump" into ub-launcher3-qt-r1-dev

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

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 793e02f..5afc73c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -819,8 +819,9 @@
             pw.println("  assistantAvailable=" + mAssistantAvailable);
             pw.println("  assistantDisabled="
                     + QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags));
-            pw.println("  resumed="
-                    + mOverviewComponentObserver.getActivityControlHelper().isResumed());
+            boolean resumed = mOverviewComponentObserver != null
+                    && mOverviewComponentObserver.getActivityControlHelper().isResumed();
+            pw.println("  resumed=" + resumed);
             pw.println("  useSharedState=" + mConsumer.useSharedSwipeState());
             if (mConsumer.useSharedSwipeState()) {
                 sSwipeSharedState.dump("    ", pw);