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

Commit 53db761e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev

parents b10e3397 9fff53f2

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

+2 −2
Original line number Diff line number Diff line
@@ -1623,9 +1623,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.