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

am: 1d3d19f2e1

Change-Id: I031c5466fabd2992bbef8b1cfb0f7de5bdbfad10
This commit is contained in:
Winson Chung 2019-07-26 10:00:48 -07:00 committed by android-build-merger
commit a7d12b227f
1 changed files with 3 additions and 2 deletions

View File

@ -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);