commit 1d818b06fef962003221a74ecbb0d9c525cd6968
author Keisuke Kuroyanagi <ksk@google.com> Sun Sep 08 20:20:51 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Sep 08 20:20:51 2013 -0700
tree 4d25b00d8f71490ab8a6064b0e0f70767a9962b8
parent 8a325042ddfde71e0f9dbc712180803f532c7a7d
parent 773f2272421738b400c5eb24b36d36b9d3b29207

am 773f2272: Fix: wrong locking order.

* commit '773f2272421738b400c5eb24b36d36b9d3b29207':
  Fix: wrong locking order.

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index b92283c..e62a35a 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -84,9 +84,11 @@
     /** Whether to support dynamically updating the dictionary */
     private final boolean mIsUpdatable;
 
+    // TODO: remove, once dynamic operations will be serialized
     /** Controls access to the shared binary dictionary file across multiple instances. */
     private final DictionaryController mSharedDictionaryController;
 
+    // TODO: remove, once dynamic operations will be serialized
     /** Controls access to the local binary dictionary for this instance. */
     private final DictionaryController mLocalDictionaryController = new DictionaryController();
 
@@ -446,9 +448,9 @@
     private final void syncReloadDictionaryInternal() {
         // Ensure that only one thread attempts to read or write to the shared binary dictionary
         // file at the same time.
-        mLocalDictionaryController.writeLock().lock();
+        mSharedDictionaryController.writeLock().lock();
         try {
-            mSharedDictionaryController.writeLock().lock();
+            mLocalDictionaryController.writeLock().lock();
             try {
                 final long time = SystemClock.uptimeMillis();
                 final boolean dictionaryFileExists = dictionaryFileExists();
@@ -483,10 +485,10 @@
                 }
                 mLocalDictionaryController.mLastUpdateTime = time;
             } finally {
-                mSharedDictionaryController.writeLock().unlock();
+                mLocalDictionaryController.writeLock().unlock();
             }
         } finally {
-            mLocalDictionaryController.writeLock().unlock();
+            mSharedDictionaryController.writeLock().unlock();
         }
     }
 
@@ -519,16 +521,16 @@
     private class AsyncLoadDictionaryToMemoryTask extends Thread {
         @Override
         public void run() {
-            mLocalDictionaryController.writeLock().lock();
+            mSharedDictionaryController.readLock().lock();
             try {
-                mSharedDictionaryController.readLock().lock();
+                mLocalDictionaryController.writeLock().lock();
                 try {
                     loadDictionaryAsync();
                 } finally {
-                    mSharedDictionaryController.readLock().unlock();
+                    mLocalDictionaryController.writeLock().unlock();
                 }
             } finally {
-                mLocalDictionaryController.writeLock().unlock();
+                mSharedDictionaryController.readLock().unlock();
             }
         }
     }