commit 5089140cdaaaf86f415c7fcd82b4b9c8779a6662
author Winson Chung <winsonc@google.com> Thu Jul 25 15:22:24 2019 -0700
committer Winson Chung <winsonc@google.com> Thu Jul 25 15:22:47 2019 -0700
tree 955e44c228033ae618c6d4510bf1a9f53a5f6f5a
parent 2cccb134a48b7e6277692c3d1a20d1fa507fe7c4

Fix NPE in service dump

Bug: 138144992
Change-Id: I608ea209b04fce13a63190ec424849dc909a6a9a

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 d7ed15c..79d1151 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -816,8 +816,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);