am bfe5c07f: am ededdc6a: Merge "Avoid NPE"

* commit 'bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee':
  Avoid NPE
This commit is contained in:
Kurt Partridge 2013-04-17 19:41:24 -07:00 committed by Android Git Automerger
commit de51abf1cf

View file

@ -380,6 +380,9 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
requestIndicatorRedraw();
mStatistics.reset();
checkForEmptyEditor();
if (mFeedbackLogBuffer == null) {
resetFeedbackLogging();
}
if (!isAllowedToLog()) {
// Log.w(TAG, "not in usability mode; not logging");
return;
@ -413,9 +416,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
}
};
}
if (mFeedbackLogBuffer == null) {
resetFeedbackLogging();
}
}
private void resetFeedbackLogging() {