commit 990698b941b618b7ccf1bc8b2c3e4a3f851d7cac
author android-build-team Robot <android-build-team-robot@google.com> Tue Mar 10 02:11:31 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Mar 10 02:11:31 2020 +0000
tree e4c29ff801890f0c9ceeffc3211a38a93b2233e8
parent 54e37dcb1b7cd30ad4598c6f2dd1a79ab1bb0648
parent 3f20390b0e1d2e8650f7006d5a12d313960edc21

Snap for 6279178 from 3f20390b0e1d2e8650f7006d5a12d313960edc21 to rvc-release

Change-Id: I387bd78f9d7f1da8425a8f43f71cc73eccacc25a

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

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 0f63336..4598cdf 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -760,9 +760,7 @@
         } else {
             // Dump everything
             FeatureFlags.dump(pw);
-            if (mDeviceState.isUserUnlocked()) {
-                PluginManagerWrapper.INSTANCE.get(getBaseContext()).dump(pw);
-            }
+            PluginManagerWrapper.INSTANCE.get(getBaseContext()).dump(pw);
             mDeviceState.dump(pw);
             if (mOverviewComponentObserver != null) {
                 mOverviewComponentObserver.dump(pw);

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index 85464aa..d845650 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -518,7 +518,6 @@
                 + QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags));
         pw.println("  currentActiveRotation=" + getCurrentActiveRotation());
         pw.println("  displayRotation=" + getDisplayRotation());
-        pw.println("  isUserUnlocked=" + mIsUserUnlocked);
         mOrientationTouchTransformer.dump(pw);
     }
 }