Remove FLAG_ACTIVITY_NEW_TASK when starting tachyon
Having this flag conflicts with startActivityWithResult which
results in not passing the signature check on the other side.
Test: Manually verified the video calls are started without needing
to confirm.
Bug: 36874501
Change-Id: Icd45076ad03438e00a00403109503600f6e18b26
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 4a4b8d6..3c088b4 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -436,8 +436,6 @@
}
}
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
mHasIntentLaunched = true;
try {
final int actionType = intent.getIntExtra(EXTRA_ACTION_TYPE,
@@ -445,10 +443,12 @@
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);
}