[Signin][Android] Only reload accounts if account fetching succeeded

Bug: b/40284908
Change-Id: Ia839e3daf5bfc2f805417cafcee716a8c7652e9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5377867
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Samar Chehade-Lepleux <samarchehade@google.com>
Cr-Commit-Position: refs/heads/main@{#1276802}

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java

@@ -168,7 +168,9 @@ private SigninManagerImpl(
             mAccountManagerFacade.addObserver(this);
             Promise<List<CoreAccountInfo>> coreAccountInfosPromise =
                     mAccountManagerFacade.getCoreAccountInfos();
-            if (coreAccountInfosPromise.isFulfilled()) {
+            if (coreAccountInfosPromise.isFulfilled()
+                    && (mAccountManagerFacade.didAccountFetchSucceed()
+                            || !coreAccountInfosPromise.getResult().isEmpty())) {
                 seedThenReloadAllAccountsFromSystem(
                         CoreAccountInfo.getIdFrom(
                                 identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN)));
@@ -177,8 +179,8 @@ private SigninManagerImpl(
     }
 
     /**
-     * Triggered during SigninManagerAndroidWrapper's KeyedService::Shutdown.
-     * Drop references with external services and native.
+     * Triggered during SigninManagerAndroidWrapper's KeyedService::Shutdown. Drop references with
+     * external services and native.
      */
     @VisibleForTesting
     @CalledByNative
@@ -203,6 +205,12 @@ public void onCoreAccountInfosChanged() {
                 mAccountManagerFacade.getCoreAccountInfos();
         assert coreAccountInfosPromise.isFulfilled();
         List<CoreAccountInfo> coreAccountInfos = coreAccountInfosPromise.getResult();
+        if (!mAccountManagerFacade.didAccountFetchSucceed() && coreAccountInfos.isEmpty()) {
+            // If the account fetch did not succeed, the AccountManagerFacade falls back to an empty
+            // list. Do nothing when this is the case.
+            return;
+        }
+
         @Nullable
         CoreAccountInfo primaryAccountInfo =
                 mIdentityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN);