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

Commit 1e29965a authored by Victor Chang's avatar Victor Chang Committed by android-build-merger
Browse files

Merge \"Fix that work apps settings page crash after changing work profile to... 

Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 64372056

Change-Id: If23d7b5ab2c79874714a9f6a67625b09e7f83699
parents 18c57b5c 64372056

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

+7 −3
Original line number Diff line number Diff line
@@ -186,9 +186,13 @@ class ActivityStartInterceptor { 
        if (mActivityOptions == null) {

            mActivityOptions = ActivityOptions.makeBasic();

        }



        ActivityRecord homeActivityRecord = mSupervisor.getHomeActivity();

        if (homeActivityRecord != null && homeActivityRecord.task != null) {

            // Showing credential confirmation activity in home task to avoid stopping multi-windowed

            // mode after showing the full-screen credential confirmation activity.

        mActivityOptions.setLaunchTaskId(mSupervisor.getHomeActivity().task.taskId);

            mActivityOptions.setLaunchTaskId(homeActivityRecord.task.taskId);

        }



        final UserInfo parent = mUserManager.getProfileParent(mUserId);

        mRInfo = mSupervisor.resolveIntent(mIntent, mResolvedType, parent.id);