diff options
| author | Winson Chung <winsonc@google.com> | 2019-07-26 10:00:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-26 10:00:48 -0700 |
| commit | a7d12b227f2b66dee15ae51d74676e5529e860e7 (patch) | |
| tree | 43cdfe40d419e67a2e381d061035fe4714f0ca5c | |
| parent | 6439337ceeba6e2643148a61c98e2449d3ffe4b9 (diff) | |
| parent | 1d3d19f2e12c584dce9b593d6086b2a8601005ab (diff) | |
| download | android_packages_apps_Trebuchet-a7d12b227f2b66dee15ae51d74676e5529e860e7.tar.gz android_packages_apps_Trebuchet-a7d12b227f2b66dee15ae51d74676e5529e860e7.tar.bz2 android_packages_apps_Trebuchet-a7d12b227f2b66dee15ae51d74676e5529e860e7.zip | |
Merge "Fix NPE in service dump" into ub-launcher3-qt-r1-dev
am: 1d3d19f2e1
Change-Id: I031c5466fabd2992bbef8b1cfb0f7de5bdbfad10
| -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); |