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

Commit 8b08b886 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Properly disable status bar on secure lockscreens. 

(Broken implementation appeared in change I967e455.)

Bug: 5158885
Change-Id: I0e22c269ff76d19bcdd5e51e1722e34fdc025dfa
parent d5962a12

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

+5 −4
Original line number Diff line number Diff line
@@ -1138,12 +1138,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback, 
                }

            }



            // if the keyguard is shown, allow the status bar to open

            // only if the keyguard is insecure and is covered by another window

            boolean enable = !mShowing || (mHidden && !isSecure());

            // if the keyguard is shown, allow the status bar to open only if the keyguard is

            // insecure and (is covered by another window OR this feature is enabled in general)

            boolean enable = !mShowing

                || ((ENABLE_STATUS_BAR_IN_KEYGUARD || mHidden) && !isSecure());

            mStatusBarManager.disable(enable ?

                         StatusBarManager.DISABLE_NONE :

                         ( (ENABLE_STATUS_BAR_IN_KEYGUARD ? 0 : StatusBarManager.DISABLE_EXPAND)

                         ( StatusBarManager.DISABLE_EXPAND

                         | StatusBarManager.DISABLE_NAVIGATION

                         | StatusBarManager.DISABLE_CLOCK));

        }