Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859008a2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-b7e40a4c-b364-433f-8a7c-b0153888999f' 

* changes:
  Remove FLAG_ACTIVITY_NEW_TASK when starting tachyon am: 9649af19
  Remove FLAG_ACTIVITY_NEW_TASK when starting tachyon
parents 29ab4041 0f9f1d4b

src/com/android/contacts/quickcontact/QuickContactActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -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);

                }