summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/SyncManager.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-10-10 14:36:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 14:36:47 -0700
commit5a5b3b4928c47ba93c80ddbf9884650b5c7c1b9b (patch)
tree766d880b182c12e8671b3656587d4e21009defa8 /core/java/android/content/SyncManager.java
parent39050353d954fc87cc18152da82c87df6e651421 (diff)
parentcd25032d019259ed70490ec9e653a66367766450 (diff)
downloadframeworks_base-5a5b3b4928c47ba93c80ddbf9884650b5c7c1b9b.zip
frameworks_base-5a5b3b4928c47ba93c80ddbf9884650b5c7c1b9b.tar.gz
frameworks_base-5a5b3b4928c47ba93c80ddbf9884650b5c7c1b9b.tar.bz2
am cd25032d: am 21973701: am 0dd0b144: Merge "Include all accounts in dumpsys." into jb-mr1-dev
* commit 'cd25032d019259ed70490ec9e653a66367766450': Include all accounts in dumpsys.
Diffstat (limited to 'core/java/android/content/SyncManager.java')
-rw-r--r--core/java/android/content/SyncManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java
index 053cc6f..93c9526 100644
--- a/core/java/android/content/SyncManager.java
+++ b/core/java/android/content/SyncManager.java
@@ -889,6 +889,9 @@ public class SyncManager {
}
private void onUserStarting(int userId) {
+ // Make sure that accounts we're about to use are valid
+ AccountManagerService.getSingleton().validateAccounts(userId);
+
mSyncAdapters.invalidateCache(userId);
updateRunningAccounts();
@@ -1078,9 +1081,9 @@ public class SyncManager {
}
pw.print("memory low: "); pw.println(mStorageIsLow);
- final AccountAndUser[] accounts = mRunningAccounts;
+ final AccountAndUser[] accounts = AccountManagerService.getSingleton().getAllAccounts();
- pw.print("running accounts: ");
+ pw.print("accounts: ");
if (accounts != INITIAL_ACCOUNTS_ARRAY) {
pw.println(accounts.length);
} else {