diff options
author | Gary Mai <garymai@google.com> | 2017-05-16 10:53:32 -0700 |
---|---|---|
committer | Gary Mai <garymai@google.com> | 2017-05-16 10:53:32 -0700 |
commit | 9649af1903aa7edbd0c84c19681899b0d3616c4f (patch) | |
tree | c386950cff9c60d4d982845aca4eab0abc281021 | |
parent | bf535883ab20c8c88827190d92a961a54c4824a8 (diff) | |
download | packages_apps_Contacts-9649af1903aa7edbd0c84c19681899b0d3616c4f.tar.gz packages_apps_Contacts-9649af1903aa7edbd0c84c19681899b0d3616c4f.tar.bz2 packages_apps_Contacts-9649af1903aa7edbd0c84c19681899b0d3616c4f.zip |
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
-rw-r--r-- | src/com/android/contacts/quickcontact/QuickContactActivity.java | 6 |
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); } |