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

Commit 9e7f7c11 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allowing activity occludes keyguard if activity has showWhenLocked flag" into tm-dev

parents 0e77b7ec e9ff9a02

services/core/java/com/android/server/wm/ActivityStartInterceptor.java

+2 −2
Original line number Diff line number Diff line
@@ -355,10 +355,10 @@ class ActivityStartInterceptor { 
     * @return The intercepting intent if needed.

     */

    private Intent interceptWithConfirmCredentialsIfNeeded(ActivityInfo aInfo, int userId) {

        if (!mService.mAmInternal.shouldConfirmCredentials(userId)) {

        if ((aInfo.flags & ActivityInfo.FLAG_SHOW_WHEN_LOCKED) != 0

                || !mService.mAmInternal.shouldConfirmCredentials(userId)) {

            return null;

        }

        // TODO(b/28935539): should allow certain activities to bypass work challenge

        final IntentSender target = createIntentSenderForOriginalIntent(mCallingUid,

                FLAG_CANCEL_CURRENT | FLAG_ONE_SHOT | FLAG_IMMUTABLE);

        final KeyguardManager km = (KeyguardManager) mServiceContext