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

Commit b8645fa7 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev 

* commit 'a7cad8e8':
  Fixed a bug where the secure camera would flash when rotated
parents 7e1775d2 a7cad8e8

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

+3 −2
Original line number Diff line number Diff line
@@ -4417,7 +4417,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    if (mAppsToBeHidden.isEmpty()) {

                        if (dismissKeyguard && !mKeyguardSecure) {

                            mAppsThatDismissKeyguard.add(appToken);

                        } else if (win.isDrawnLw()) {

                        } else if (win.isDrawnLw() || win.hasAppShownWindows()) {

                            mWinShowWhenLocked = win;

                            mHideLockScreen = true;

                            mForceStatusBarFromKeyguard = false;
@@ -4451,7 +4451,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        mWinDismissingKeyguard = win;

                        mSecureDismissingKeyguard = mKeyguardSecure;

                        mForceStatusBarFromKeyguard = mShowingLockscreen && mKeyguardSecure;

                    } else if (mAppsToBeHidden.isEmpty() && showWhenLocked && win.isDrawnLw()) {

                    } else if (mAppsToBeHidden.isEmpty() && showWhenLocked

                            && (win.isDrawnLw() || win.hasAppShownWindows())) {

                        if (DEBUG_LAYOUT) Slog.v(TAG,

                                "Setting mHideLockScreen to true by win " + win);

                        mHideLockScreen = true;