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

Commit f8e4e2e3 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "Fix issue with activity reuse for aliased components." into nyc-dev am: 31eb784f 

am: 126a1b24

* commit '126a1b24':
  Fix issue with activity reuse for aliased components.
parents b57207be 126a1b24

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

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,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;