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

Commit e482eaf6 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

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

am: 72c216f2

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

Change-Id: I93e02ad16b4dc0c92a7e02432b992cbbe9c77aa1
parents d7d1c455 72c216f2

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

+1 −1
Original line number Original line 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() &&

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

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

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

                    win.hideLw(false);

                    win.hideLw(false);