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

am: 126a1b24b3

* commit '126a1b24b3deac00aa90b53160e6ca8673a0075e':
  Fix issue with activity reuse for aliased components.

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

@@ -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;