commit 8d7365d4c0cdba2a586142766a903d823fc73288
author Satoshi Kataoka <satok@google.com> Tue Sep 24 05:20:10 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 24 05:20:10 2013 -0700
tree c3cbe9af69528666d0865739434de44ac624c130
parent 947592496f42ff13e570dc6cabb02f46d371bc02
parent d1ae03046c1b502117129831286ed4ea0828740f

am d1ae0304: Fix OOBE in JB backword

* commit 'd1ae03046c1b502117129831286ed4ea0828740f':
  Fix OOBE in JB backword

java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
index 0b3052e..4e61eda 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -206,7 +206,14 @@
         }
 
         public int getCategoryPageSize(int categoryId) {
-            return mShownCategories.get(categoryId).mPageCount;
+            for (final CategoryProperties prop : mShownCategories) {
+                if (prop.mCategoryId == categoryId) {
+                    return prop.mPageCount;
+                }
+            }
+            Log.w(TAG, "Invalid category id: " + categoryId);
+            // Should not reach here.
+            return 0;
         }
 
         public void setCurrentCategoryId(int categoryId) {