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

Commit 89d4a9a1 authored by Victor Chang's avatar Victor Chang
Browse files

Fix that work apps settings page crash after changing work profile to use separated lock 

Change-Id: I77df9d4a6e23ca6041da15f5908436375efa3b21
Fix: 29176549
parent 6f1ed200

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

+7 −3
Original line number Original line Diff line number Diff line
@@ -183,9 +183,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);