Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03123a44 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I06fb62223512ee80dd0249b43f788b4d1837aef0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db7fafbe fa4f8ac4

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -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) {