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

Commit 3c6d192a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allowing activity occludes keyguard if activity has showWhenLocked... 

Merge "Allowing activity occludes keyguard if activity has showWhenLocked flag" into tm-dev am: 9e7f7c11

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004227

Change-Id: If13976f460fad06654551169c0587b608ee51965
parents 38cd5176 9e7f7c11

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