summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Mai <garymai@google.com>2017-05-16 17:55:44 +0000
committerGary Mai <garymai@google.com>2017-05-16 17:55:44 +0000
commit0f9f1d4bf825778e2cc85daeb4aa910be594581b (patch)
tree7369b021cc991da16a639e8432ac179ae25a74a7
parentd471fa671dd76050b2e0b220131b76a172984c6d (diff)
parent9649af1903aa7edbd0c84c19681899b0d3616c4f (diff)
downloadandroid_packages_apps_Contacts-0f9f1d4bf825778e2cc85daeb4aa910be594581b.tar.gz
android_packages_apps_Contacts-0f9f1d4bf825778e2cc85daeb4aa910be594581b.tar.bz2
android_packages_apps_Contacts-0f9f1d4bf825778e2cc85daeb4aa910be594581b.zip
Remove FLAG_ACTIVITY_NEW_TASK when starting tachyon am: 9649af1903
Change-Id: Iee4be6b496a2226a9dbac8486b719764908ceb7e
-rw-r--r--src/com/android/contacts/quickcontact/QuickContactActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 4a4b8d624..3c088b4c1 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -436,8 +436,6 @@ public class QuickContactActivity extends ContactsActivity {
}
}
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
mHasIntentLaunched = true;
try {
final int actionType = intent.getIntExtra(EXTRA_ACTION_TYPE,
@@ -445,10 +443,12 @@ public class QuickContactActivity extends ContactsActivity {
final String thirdPartyAction = intent.getStringExtra(EXTRA_THIRD_PARTY_ACTION);
Logger.logQuickContactEvent(mReferrer, mContactType,
CardType.UNKNOWN_CARD, actionType, thirdPartyAction);
- // For the tachyon call action, we need to use startActivityForResult.
+ // For the tachyon call action, we need to use startActivityForResult and not
+ // add FLAG_ACTIVITY_NEW_TASK to the intent.
if (TACHYON_CALL_ACTION.equals(intent.getAction())) {
QuickContactActivity.this.startActivityForResult(intent, /* requestCode */ 0);
} else {
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
ImplicitIntentsUtil.startActivityInAppIfPossible(QuickContactActivity.this,
intent);
}