commit f77e9d7e3adcd89c00243f4215bebb3ece3b59dd
author Kurt Partridge <kep@google.com> Fri Jan 25 17:17:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 25 17:17:34 2013 +0000
tree e5955096393bbe1a5470002bda458b8cc13c73ba
parent 5228745ae025571d25062e12f5aedcd71ad08ebb
parent 63bc2795967ddf99d3ac57e61153f8b2faa649ac

Merge "Initialize ResearchLogger later to avoid NPE"

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

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index d7c97ef..d6487cb 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -412,9 +412,6 @@
     public void onCreate() {
         Settings.init(this);
         LatinImeLogger.init(this);
-        if (ProductionFlag.IS_EXPERIMENTAL) {
-            ResearchLogger.getInstance().init(this);
-        }
         RichInputMethodManager.init(this);
         mRichImm = RichInputMethodManager.getInstance();
         SubtypeSwitcher.init(this);
@@ -430,6 +427,9 @@
         loadSettings();
         initSuggest();
 
+        if (ProductionFlag.IS_EXPERIMENTAL) {
+            ResearchLogger.getInstance().init(this);
+        }
         mDisplayOrientation = getResources().getConfiguration().orientation;
 
         // Register to receive ringer mode change and network state change.