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

Commit 64372056 authored by Victor Chang's avatar Victor Chang Committed by Android (Google) Code Review
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
parents 43f6a45e 89d4a9a1

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

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

        if (mActivityOptions == null) {

            mActivityOptions = ActivityOptions.makeBasic();

            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

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

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

            // 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);

        final UserInfo parent = mUserManager.getProfileParent(mUserId);

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

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