aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKurt Partridge <kep@google.com>2013-01-25 09:19:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-25 09:19:21 -0800
commit768a00a77f025508cc3c14f104c2b39c7ce9dc03 (patch)
treea3e2f30e4fb264162b5f4e7920196838f1f0f15e /java/src
parent72a323a1eb697a51ee997356766f88c1bbdad9f4 (diff)
parentf77e9d7e3adcd89c00243f4215bebb3ece3b59dd (diff)
downloadlatinime-768a00a77f025508cc3c14f104c2b39c7ce9dc03.tar.gz
latinime-768a00a77f025508cc3c14f104c2b39c7ce9dc03.tar.xz
latinime-768a00a77f025508cc3c14f104c2b39c7ce9dc03.zip
am f77e9d7e: Merge "Initialize ResearchLogger later to avoid NPE"
# Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit 'f77e9d7e3adcd89c00243f4215bebb3ece3b59dd': Initialize ResearchLogger later to avoid NPE
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index d7c97ef1e..d6487cb0c 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -412,9 +412,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
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 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
loadSettings();
initSuggest();
+ if (ProductionFlag.IS_EXPERIMENTAL) {
+ ResearchLogger.getInstance().init(this);
+ }
mDisplayOrientation = getResources().getConfiguration().orientation;
// Register to receive ringer mode change and network state change.