diff options
| author | Winson Chung <winsonc@google.com> | 2019-07-26 10:09:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-26 10:09:45 -0700 |
| commit | 3874e556a569bed4242e01c8cfce6a1b4a6c63ad (patch) | |
| tree | e4c9ed9a9cd94920c0ef8ca217898e501992e405 | |
| parent | 02a9aec015a9fb98534f42cd4fb500ef574c5550 (diff) | |
| parent | a7d12b227f2b66dee15ae51d74676e5529e860e7 (diff) | |
| download | android_packages_apps_Trebuchet-3874e556a569bed4242e01c8cfce6a1b4a6c63ad.tar.gz android_packages_apps_Trebuchet-3874e556a569bed4242e01c8cfce6a1b4a6c63ad.tar.bz2 android_packages_apps_Trebuchet-3874e556a569bed4242e01c8cfce6a1b4a6c63ad.zip | |
Merge "Fix NPE in service dump" into ub-launcher3-qt-r1-dev am: 1d3d19f2e1
am: a7d12b227f
Change-Id: Ic97e416874c2989ab293b69d54190a02f281a043
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java | 5 |
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 793e02f93..5afc73cc1 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 @@ 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); |