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
This commit is contained in:
Kurt Partridge 2013-01-25 09:19:21 -08:00 committed by Android Git Automerger
commit 768a00a77f

View file

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