am bf0d6af3: Merge "[TestPrep4] Add some finals"

* commit 'bf0d6af3d38c1637b40ed9e844fc05471274a2d7':
  [TestPrep4] Add some finals
main
Kurt Partridge 2013-02-21 14:15:38 -08:00 committed by Android Git Automerger
commit 8cda557824
1 changed files with 3 additions and 3 deletions

View File

@ -222,10 +222,10 @@ public abstract class MainLogBuffer extends FixedLogBuffer {
final boolean canIncludePrivateData); final boolean canIncludePrivateData);
@Override @Override
protected void shiftOutWords(int numWords) { protected void shiftOutWords(final int numWords) {
int oldNumActualWords = getNumActualWords(); final int oldNumActualWords = getNumActualWords();
super.shiftOutWords(numWords); super.shiftOutWords(numWords);
int numWordsShifted = oldNumActualWords - getNumActualWords(); final int numWordsShifted = oldNumActualWords - getNumActualWords();
mNumWordsUntilSafeToSample -= numWordsShifted; mNumWordsUntilSafeToSample -= numWordsShifted;
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "wordsUntilSafeToSample now at " + mNumWordsUntilSafeToSample); Log.d(TAG, "wordsUntilSafeToSample now at " + mNumWordsUntilSafeToSample);