Merge "[Rlog6.1] Fix LOG_EVERYTHING bug."

This commit is contained in:
Kurt Partridge 2012-12-19 17:20:12 -08:00 committed by Android (Google) Code Review
commit c2049c3284

View file

@ -681,7 +681,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
if (!mCurrentLogUnit.isEmpty()) {
if (mMainLogBuffer != null) {
mMainLogBuffer.shiftIn(mCurrentLogUnit);
if (mMainLogBuffer.isSafeToLog() && mMainResearchLog != null) {
if ((mMainLogBuffer.isSafeToLog() || LOG_EVERYTHING) && mMainResearchLog != null) {
publishLogBuffer(mMainLogBuffer, mMainResearchLog,
true /* isIncludingPrivateData */);
mMainLogBuffer.resetWordCounter();