Skip to content
Snippets Groups Projects
Commit f77e9d7e authored by Kurt Partridge's avatar Kurt Partridge Committed by Android (Google) Code Review
Browse files

Merge "Initialize ResearchLogger later to avoid NPE"

parents 5228745a 63bc2795
No related branches found
No related tags found
No related merge requests found
...@@ -412,9 +412,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction ...@@ -412,9 +412,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
public void onCreate() { public void onCreate() {
Settings.init(this); Settings.init(this);
LatinImeLogger.init(this); LatinImeLogger.init(this);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.getInstance().init(this);
}
RichInputMethodManager.init(this); RichInputMethodManager.init(this);
mRichImm = RichInputMethodManager.getInstance(); mRichImm = RichInputMethodManager.getInstance();
SubtypeSwitcher.init(this); SubtypeSwitcher.init(this);
...@@ -430,6 +427,9 @@ public final class LatinIME extends InputMethodService implements KeyboardAction ...@@ -430,6 +427,9 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
loadSettings(); loadSettings();
initSuggest(); initSuggest();
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.getInstance().init(this);
}
mDisplayOrientation = getResources().getConfiguration().orientation; mDisplayOrientation = getResources().getConfiguration().orientation;
// Register to receive ringer mode change and network state change. // Register to receive ringer mode change and network state change.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment