diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-04-07 11:58:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-07 11:58:21 -0700 |
commit | 7aed1e14b53778ea4044362b001fb5bf5cac09c0 (patch) | |
tree | bf4c2518ec14b6c21bdd1e87b2f2df3bafedd945 /core/java/android/content/SyncStorageEngine.java | |
parent | d00fb429c1a62c216cf110783898670bbb346c6e (diff) | |
parent | d66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa (diff) | |
download | frameworks_base-7aed1e14b53778ea4044362b001fb5bf5cac09c0.zip frameworks_base-7aed1e14b53778ea4044362b001fb5bf5cac09c0.tar.gz frameworks_base-7aed1e14b53778ea4044362b001fb5bf5cac09c0.tar.bz2 |
am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Diffstat (limited to 'core/java/android/content/SyncStorageEngine.java')
-rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index d81b2a3..6413cec 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/core/java/android/content/SyncStorageEngine.java @@ -332,11 +332,11 @@ public class SyncStorageEngine extends Handler { @Override public void handleMessage(Message msg) { if (msg.what == MSG_WRITE_STATUS) { - synchronized (mAccounts) { + synchronized (mAuthorities) { writeStatusLocked(); } } else if (msg.what == MSG_WRITE_STATISTICS) { - synchronized (mAccounts) { + synchronized (mAuthorities) { writeStatisticsLocked(); } } |