commit 7faf750f4a0868afd2d0692a96794ccecb2ede28
author Yuichiro Hanada <yhanada@google.com> Thu Sep 20 06:10:32 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 20 06:10:32 2012 -0700
tree 03700a63195ca3af3987aaf526edbcc69a0ecf77
parent f1eb35c9f0ef96da7921d612f3b433834641e126
parent 73779f7631d41f16f89c62cae09a1b27d8189dc3

am 73779f76: Make readUnigramsAndBigramsBinary read linked-list nodes.

* commit '73779f7631d41f16f89c62cae09a1b27d8189dc3':
  Make readUnigramsAndBigramsBinary read linked-list nodes.

java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java

diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
index 7a1b9dc..4060710 100644
--- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
+++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
@@ -92,7 +92,18 @@
             }
 
             if (p.mPosition == p.mNumOfCharGroup) {
-                stack.pop();
+                if (formatOptions.mHasLinkedListNode) {
+                    final int forwardLinkAddress = buffer.readUnsignedInt24();
+                    if (forwardLinkAddress != FormatSpec.NO_FORWARD_LINK_ADDRESS) {
+                        // the node has a forward link.
+                        p.mNumOfCharGroup = Position.NOT_READ_GROUPCOUNT;
+                        p.mAddress = forwardLinkAddress;
+                    } else {
+                        stack.pop();
+                    }
+                } else {
+                    stack.pop();
+                }
             } else {
                 // the node has more groups.
                 p.mAddress = buffer.position();