From d1ae03046c1b502117129831286ed4ea0828740f Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok@google.com>
Date: Tue, 24 Sep 2013 21:08:45 +0900
Subject: [PATCH] Fix OOBE in JB backword

Bug: 10905948
Change-Id: I4e953296ce3067d05fc5759375f40513580484a6
---
 .../android/inputmethod/keyboard/EmojiKeyboardView.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
index 0b3052e09..4e61edac2 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -206,7 +206,14 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
         }
 
         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) {