am c2049c32: Merge "[Rlog6.1] Fix LOG_EVERYTHING bug."

* commit 'c2049c3284e6fb64860f133c798388582b35b862':
  [Rlog6.1] Fix LOG_EVERYTHING bug.
main
Kurt Partridge 2012-12-19 17:21:21 -08:00 committed by Android Git Automerger
commit e18acaa66c
1 changed files with 1 additions and 1 deletions

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