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

Commit f02cbc8f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert argument to intent in ChooseTypeAndAccountActivity" into qt-dev... 

Merge "Convert argument to intent in ChooseTypeAndAccountActivity" into qt-dev am: e5ca4abc am: 3f5a4111 am: 1ff659dc am: 874161de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20541824



Change-Id: I3f6fe30560bce9cf6b252b7e154ace99c3c78e99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1188369 874161de

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -396,7 +396,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
                mExistingAccounts = AccountManager.get(this).getAccountsForPackage(mCallingPackage,

                mExistingAccounts = AccountManager.get(this).getAccountsForPackage(mCallingPackage,

                        mCallingUid);

                        mCallingUid);

                intent.setFlags(intent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK);

                intent.setFlags(intent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK);

                startActivityForResult(intent, REQUEST_ADD_ACCOUNT);

                startActivityForResult(new Intent(intent), REQUEST_ADD_ACCOUNT);

                return;

                return;

            }

            }

        } catch (OperationCanceledException e) {

        } catch (OperationCanceledException e) {