Merge "Initialize ResearchLogger later to avoid NPE"

This commit is contained in:
Kurt Partridge 2013-01-25 17:17:34 +00:00 committed by Android (Google) Code Review
commit f77e9d7e3a

View file

@ -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.