commit 09ef8d7daa57aa4fc5041b08563f5ec59812f1b1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 10 00:38:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 10 00:38:09 2020 +0000
tree 451291daec7f016872aa5dcc033cb7f0814fbaf0
parent 9f0e05570ce3ec176a74dc0d1bc0f192fb5e79bd
parent 2bf4678a8cff525aa3568c8ef1dabef83b2c1b68

Fix crash when dumping before user unlocks am: 7759c43bf2 am: 0b9f89caf6 am: 2bf4678a8c

Change-Id: I8235648c2e6bc300d3fc20ff37e60d94dc9ad442

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

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