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

Commit ba7db92d authored by Winson Chung's avatar Winson Chung
Browse files

Fixing crash when task is already parent of activity. 

- When launching an activity into a task, it's parent is already set
  which can cause the reparent call to crash.  Instead, just move the
  activity to the top.

Bug: 34933399
Test: Launch an app that doesn't support multiwindow, and engage split
      screen, or launch a PiP activity and tap to show the menu

Change-Id: Iaa36003e88f4021f2483dedc71802023369d6558
parent ddb80216

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

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

    }





    private void addOrReparentStartingActivity(TaskRecord parent, String reason) {

    private void addOrReparentStartingActivity(TaskRecord parent, String reason) {

        if (mStartActivity.task == null) {

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

            parent.addActivityToTop(mStartActivity);

            parent.addActivityToTop(mStartActivity);

        } else {

        } else {

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

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