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

Commit 550c0f16 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Show confirm credential activity on parent when unpausing work." into udc-dev am: 383be3ac 

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



Change-Id: Icf2441f34666b1f3cdd1b582c862f3ed7436f2dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5a1b692 383be3ac

services/core/java/com/android/server/pm/UserManagerService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1545,7 +1545,8 @@ public class UserManagerService extends IUserManager.Stub { 
        // intentSender

        // intentSender

        unlockIntent.putExtra(Intent.EXTRA_INTENT, pendingIntent.getIntentSender());

        unlockIntent.putExtra(Intent.EXTRA_INTENT, pendingIntent.getIntentSender());

        unlockIntent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

        unlockIntent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

        mContext.startActivity(unlockIntent);

        mContext.startActivityAsUser(

                unlockIntent, UserHandle.of(getProfileParentIdUnchecked(userId)));

    }

    }





    @Override

    @Override