| commit | 9a8c9aa6878638beb1c51d2cf8462eb06392fbfb | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Mon Mar 09 13:20:04 2020 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Mar 10 00:05:08 2020 +0000 |
| tree | 451291daec7f016872aa5dcc033cb7f0814fbaf0 | |
| parent | 70a75485681813625d345413a200d5583e4b1933 [diff] |
Fix crash when dumping before user unlocks Bug: 150864182 Bug: 151050221 Change-Id: I29ba2ef66b4359a47f866d02306498537c45236e (cherry picked from commit b365cc43878e0cb4e6d4b998c10cd590adc4cb8d)
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 4598cdf..0f63336 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -760,7 +760,9 @@ } else { // Dump everything FeatureFlags.dump(pw); - PluginManagerWrapper.INSTANCE.get(getBaseContext()).dump(pw); + if (mDeviceState.isUserUnlocked()) { + PluginManagerWrapper.INSTANCE.get(getBaseContext()).dump(pw); + } mDeviceState.dump(pw); if (mOverviewComponentObserver != null) { mOverviewComponentObserver.dump(pw);
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index d845650..85464aa 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -518,6 +518,7 @@ + QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)); pw.println(" currentActiveRotation=" + getCurrentActiveRotation()); pw.println(" displayRotation=" + getDisplayRotation()); + pw.println(" isUserUnlocked=" + mIsUserUnlocked); mOrientationTouchTransformer.dump(pw); } }