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

2017-02-02 20:04:57 +00:00
parent e8bc75bfcc ba7db92d16
commit 42ad9aabe3
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -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);