commit 5ab2ab12d43b06e7448e974aa8eb03a76a0d97ab
author Yuichiro Hanada <yhanada@google.com> Mon Aug 26 01:33:07 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 26 01:33:07 2013 -0700
tree cfe5a594c50cced1222dba974ef6d89234767ef2
parent b0f59af0ffc098ac674e53605a24feebac0c8ff5
parent b50a7a4bc718f3611ac1e97a940d5a59b4b0133e

am b50a7a4b: Simplify computeActualNodeArraySize.

* commit 'b50a7a4bc718f3611ac1e97a940d5a59b4b0133e':
  Simplify computeActualNodeArraySize.

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

diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
index b95db21..79f5ad8 100644
--- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
+++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
@@ -326,15 +326,11 @@
             }
             int nodeSize = getNodeHeaderSize(ptNode, formatOptions);
             if (ptNode.isTerminal()) nodeSize += FormatSpec.PTNODE_FREQUENCY_SIZE;
-            if (null == ptNode.mChildren && formatOptions.mSupportsDynamicUpdate) {
+            if (formatOptions.mSupportsDynamicUpdate) {
                 nodeSize += FormatSpec.SIGNED_CHILDREN_ADDRESS_SIZE;
             } else if (null != ptNode.mChildren) {
-                if (formatOptions.mSupportsDynamicUpdate) {
-                    nodeSize += FormatSpec.SIGNED_CHILDREN_ADDRESS_SIZE;
-                } else {
-                    nodeSize += getByteSize(getOffsetToTargetNodeArrayDuringUpdate(ptNodeArray,
-                            nodeSize + size, ptNode.mChildren));
-                }
+                nodeSize += getByteSize(getOffsetToTargetNodeArrayDuringUpdate(ptNodeArray,
+                        nodeSize + size, ptNode.mChildren));
             }
             nodeSize += getShortcutListSize(ptNode.mShortcutTargets);
             if (null != ptNode.mBigrams) {