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

Commit 77fc19fa authored by Shigeki Yokomichi's avatar Shigeki Yokomichi Committed by android-build-merger
Browse files

Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f882 

am: e79cb5c8

Change-Id: I45c03d29bec22b59decb7c95bc1464dd83094c90
parents 73321921 e79cb5c8

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

+2 −2
Original line number Diff line number Diff line
@@ -1614,9 +1614,9 @@ class ActivityStarter { 
                == (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK)) {

            // The caller has requested to completely replace any existing task with its new

            // activity. Well that should not be too hard...

            intentActivity.task.performClearTaskLocked();

            intentActivity.task.setIntent(mStartActivity);

            mReuseTask = intentActivity.task;

            mReuseTask.performClearTaskLocked();

            mReuseTask.setIntent(mStartActivity);

            // When we clear the task - focus will be adjusted, which will bring another task

            // to top before we launch the activity we need. This will temporary swap their

            // mTaskToReturnTo values and we don't want to overwrite them accidentally.