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

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

Merge "Fixed UserManagerService.evictCredentialEncryptionKey()" into udc-dev am: 5869befb 

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



Change-Id: I062b5cad9a29f9eb5ba868d802a4f79b195104f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 154133c8 5869befb

core/java/android/app/IActivityManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -594,7 +594,6 @@ interface IActivityManager { 
    void setHasTopUi(boolean hasTopUi);



    // Start of O transactions

    int restartUserInBackground(int userId);

    /** Cancels the window transitions for the given task. */

    @UnsupportedAppUsage

    void cancelTaskWindowTransition(int taskId);
@@ -869,6 +868,8 @@ interface IActivityManager { 
     */

    boolean startProfileWithListener(int userid, IProgressListener unlockProgressListener);



    int restartUserInBackground(int userId, int userStartMode);



    /**

     * Gets the ids of displays that can be used on {@link #startUserInBackgroundVisibleOnDisplay(int userId, int displayId)}.

     *

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -19111,8 +19111,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
    }















    @Override













    public int restartUserInBackground(final int userId) {













        return mUserController.restartUser(userId, USER_START_MODE_BACKGROUND);













    public int restartUserInBackground(int userId, int userStartMode) {













        return mUserController.restartUser(userId, userStartMode);















    }





























    @Override

























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



+5
−1




























Original line number
Diff line number
Diff line








@@ -1652,8 +1652,12 @@ public class UserManagerService extends IUserManager.Stub {













        checkManageUsersPermission("evict CE key");















        final IActivityManager am = ActivityManagerNative.getDefault();















        final long identity = Binder.clearCallingIdentity();













        // TODO(b/280054081): save userStartMode when user started and re-use it here instead













        final int userStartMode = isProfileUnchecked(userId)













                ? UserManagerInternal.USER_START_MODE_BACKGROUND_VISIBLE













                : UserManagerInternal.USER_START_MODE_BACKGROUND;















        try {













            am.restartUserInBackground(userId);













            am.restartUserInBackground(userId, userStartMode);















        } catch (RemoteException re) {















            throw re.rethrowAsRuntimeException();















        } finally {