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

Commit 72c216f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev

parents d6a39495 23fd1db6

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