summaryrefslogtreecommitdiffstats
path: root/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2019-07-25 15:22:24 -0700
committerWinson Chung <winsonc@google.com>2019-07-25 15:22:47 -0700
commit5089140cdaaaf86f415c7fcd82b4b9c8779a6662 (patch)
tree955e44c228033ae618c6d4510bf1a9f53a5f6f5a /quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
parent2cccb134a48b7e6277692c3d1a20d1fa507fe7c4 (diff)
downloadandroid_packages_apps_Trebuchet-5089140cdaaaf86f415c7fcd82b4b9c8779a6662.tar.gz
android_packages_apps_Trebuchet-5089140cdaaaf86f415c7fcd82b4b9c8779a6662.tar.bz2
android_packages_apps_Trebuchet-5089140cdaaaf86f415c7fcd82b4b9c8779a6662.zip
Fix NPE in service dump
Bug: 138144992 Change-Id: I608ea209b04fce13a63190ec424849dc909a6a9a
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java')
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java5
1 files changed, 3 insertions, 2 deletions
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 d7ed15c6c..79d115191 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 @@ public class TouchInteractionService extends Service implements
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);