commit 31eb784f89c7642f7e61d7dd8c08622e9269e874
author Rob Carr <racarr@google.com> Wed Feb 17 18:09:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 17 18:09:49 2016 +0000
tree e48ceb7c454a5d4ef87400360e42ef626ee337ab
parent a086f0436ad600915db1f8e0dc284d653d152e8d
parent 8f640757c6d9babc6cc331a0af6ba685ad12babd

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

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

diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index cca6fc5..1166ae1 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -1397,7 +1397,7 @@
                 }
                 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;