commit fdbc8f3785a4c097a086b2dcfbfcb2d1188cb331
author Dmitri Plotnikov <dplotnikov@google.com> Thu Jan 14 18:17:41 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 14 18:17:41 2010 -0800
tree 0c9f1b6cffa2739ddc7ba71ecd164c64ea2539ec
parent b0fbebaa12e5228a1803ae42f2c3f71df644d284
parent f4a3b7e523e36679b68edd2af632e26648758ff2

am f4a3b7e5: Solving deadlock in ContactProvider2

Merge commit 'f4a3b7e523e36679b68edd2af632e26648758ff2' into eclair-plus-aosp

* commit 'f4a3b7e523e36679b68edd2af632e26648758ff2':
  Solving deadlock in ContactProvider2

src/com/android/providers/contacts/ContactsDatabaseHelper.java

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index f248116..154f62f 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -1464,7 +1464,7 @@
      * @param cache In-memory cache of previous answers.
      * @return An unique integer mapping for the given value.
      */
-    private synchronized long getCachedId(SQLiteStatement query, SQLiteStatement insert,
+    private long getCachedId(SQLiteStatement query, SQLiteStatement insert,
             String value, HashMap<String, Long> cache) {
         // Try an in-memory cache lookup
         if (cache.containsKey(value)) {