Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue with activity reuse for aliased components." into nyc-dev

Browse Source
This commit is contained in:
Rob Carr
2016-02-17 18:09:48 +00:00
committed by Android (Google) Code Review
parent a086f0436a 8f640757c6
commit 31eb784f89
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -1397,7 +1397,7 @@ class ActivityStarter {
} }
intentActivity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, intentActivity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent,
mStartActivity.launchedFromPackage); 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 // 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. // different intent. We should start a new instance on top.
mAddingToTask = true; mAddingToTask = true;