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

Commit 85e70956 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am ccd5aeef: Workaround for a keyguard problem that appeared in the in call screen. 

Merge commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1' into eclair-plus-aosp

* commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1':
  Workaround for a keyguard problem that appeared in the in call screen.
parents 79ebdf21 f3bfed51

policy/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1450,18 +1450,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

            } else if (mHideLockScreen) {

                if (mKeyguard.hideLw(false)) {

                    mKeyguardMediator.setHidden(true);

                    changes |= FINISH_LAYOUT_REDO_LAYOUT

                            | FINISH_LAYOUT_REDO_CONFIG

                            | FINISH_LAYOUT_REDO_WALLPAPER;

                }

                mKeyguardMediator.setHidden(true);

            } else {

                if (mKeyguard.showLw(false)) {

                    mKeyguardMediator.setHidden(false);

                    changes |= FINISH_LAYOUT_REDO_LAYOUT

                            | FINISH_LAYOUT_REDO_CONFIG

                            | FINISH_LAYOUT_REDO_WALLPAPER;

                }

                mKeyguardMediator.setHidden(false);

            }

        }