Merge "Add logging to diagnose why shade isn't closing" into udc-dev am: 511e50aca8 am: fa4f8ac42f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22555069

Change-Id: I06fb62223512ee80dd0249b43f788b4d1837aef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2023-04-13 14:15:25 +00:00
committed by Automerger Merge Worker

View File

@@ -2618,6 +2618,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
}
mRemoteInputManager.closeRemoteInputs();
if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {
mShadeLogger.d("ACTION_CLOSE_SYSTEM_DIALOGS intent: closing shade");
int flags = CommandQueue.FLAG_EXCLUDE_NONE;
if (reason != null) {
if (reason.equals(SYSTEM_DIALOG_REASON_RECENT_APPS)) {
@@ -2632,6 +2633,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
}
}
mShadeController.animateCollapseShade(flags);
} else {
mShadeLogger.d("ACTION_CLOSE_SYSTEM_DIALOGS intent: non-matching user ID");
}
} else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
if (mNotificationShadeWindowController != null) {