From 3e4d00267908cfb549f22efd61e114df28e7bd21 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Thu, 16 May 2019 17:44:13 +0800 Subject: [PATCH] Fix multiple instances for Google SignIn activity appearing in task stack - Account page starts an activity with the flag FLAG_ACTIVITY_NEW_TASK to add an account and then causes multiple activity instances. - Add the flag FLAG_ACTIVITY_CLEAR_TASK in conjunction with FLAG_ACTIVITY_NEW_TASK to clear existing task before the activity is started. Fixes: 109923099 Test: robotest, manual Change-Id: I8234ab33d8aa949e5ff78320962920cb0f8b2953 --- src/com/android/settings/accounts/AddAccountSettings.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java index cca15c96d3..d4d93dda21 100644 --- a/src/com/android/settings/accounts/AddAccountSettings.java +++ b/src/com/android/settings/accounts/AddAccountSettings.java @@ -100,8 +100,9 @@ public class AddAccountSettings extends Activity { addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(AddAccountSettings.this)); addAccountOptions.putParcelable(EXTRA_USER, mUserHandle); - intent.putExtras(addAccountOptions); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtras(addAccountOptions) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); startActivityForResultAsUser(intent, ADD_ACCOUNT_REQUEST, mUserHandle); } else { setResult(RESULT_OK); -- 2.11.0