Merge "Avoid NPE"

This commit is contained in:
Kurt Partridge 2013-04-12 18:10:49 +00:00 committed by Android (Google) Code Review
commit ededdc6a8b

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() {