am ededdc6a: Merge "Avoid NPE"

* commit 'ededdc6a8b6befbb5f21a53d366354ea8c8fd5d9':
  Avoid NPE
main
Kurt Partridge 2013-04-12 11:13:44 -07:00 committed by Android Git Automerger
commit bfe5c07fda
1 changed files with 3 additions and 3 deletions

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