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

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

Merge "Fixing crash when task is already parent of activity."

parents e8bc75bf ba7db92d

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

+1 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ class ActivityStarter { 
    }



    private void addOrReparentStartingActivity(TaskRecord parent, String reason) {

        if (mStartActivity.task == null) {

        if (mStartActivity.task == null || mStartActivity.task == parent) {

            parent.addActivityToTop(mStartActivity);

        } else {

            mStartActivity.reparent(parent, parent.mActivities.size() /* top */, reason);