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

Commit ae9d437b authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

parents 3cc81aea 2c526515

src/com/android/settings/CryptKeeper.java

+3 −2
Original line number Diff line number Diff line
@@ -752,8 +752,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
        mHandler.removeMessages(MESSAGE_NOTIFY);

        mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 120 * 1000);



        // Dismiss keyguard while this screen is showing.

        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);

        // Dismiss secure & non-secure keyguards while this screen is showing.

        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD

                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);

    }



    /**