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

Commit bba78565 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
am: 1e29965a

Change-Id: Iad489061a9f91d17097f45ff10da50f9210733a1
parents 3ac8348d 1e29965a

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