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

Commit 8f640757 authored by Robert Carr's avatar Robert Carr
Browse files

Fix issue with activity reuse for aliased components. 

In this case of activity aliases, the ActivityRecord intent
member will contain the aliased component name. The TaskRecord
intent member will contain the resolved component name. When
considering an activity for reuse during start, we need to compare
our candidates ActivityRecord intent, not it's TaskRecord intent
as we have not yet resolved the alias.

Bug: 27112965
Change-Id: Ie3a1fb7b306469037372a0328364ca3d4530599e
parent dc414fa4

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

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

                intentActivity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent,

                        mStartActivity.launchedFromPackage);

            } else if (!mStartActivity.intent.filterEquals(intentActivity.task.intent)) {

            } else if (!mStartActivity.intent.filterEquals(intentActivity.intent)) {

                // In this case we are launching the root activity of the task, but with a

                // different intent. We should start a new instance on top.

                mAddingToTask = true;