Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 2d8b70e..00a7a7f 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -104,6 +104,7 @@
         mAuthenticatorHelper.listenToAccountUpdates();
         updateAuthDescriptions();
         showAccountsIfNeeded();
+        showSyncState();
     }
 
     @Override
@@ -234,6 +235,10 @@
         showSyncState();
     }
 
+    /**
+     * Shows the sync state of the accounts. Note: it must be called after the accounts have been
+     * loaded, @see #showAccountsIfNeeded().
+     */
     private void showSyncState() {
         // Catch any delayed delivery of update messages
         if (getActivity() == null || getActivity().isFinishing()) return;