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

Commit 673f708e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by android-build-merger
Browse files

Merge "Don\'t hide app windows due to not showing when locked when keyguard is... 

Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev am: 72c216f2
am: c8cd9483

* commit 'c8cd9483':
  Don't hide app windows due to not showing when locked when keyguard is hidden

Change-Id: Ie6487a016af109f9f07c844c48a49f0bc5f96fb0
parents a0a39426 c8cd9483

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4912,7 +4912,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    }

                }



                if (mWinShowWhenLocked != null &&

                if (!mKeyguardHidden && mWinShowWhenLocked != null &&

                        mWinShowWhenLocked.getAppToken() != win.getAppToken() &&

                        (attrs.flags & FLAG_SHOW_WHEN_LOCKED) == 0) {

                    win.hideLw(false);