am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"

* commit '5bd2464297db3035b93410c5359accbda74e9f50':
  Allow logging while replaying
main
Kurt Partridge 2013-04-10 19:35:47 -07:00 committed by Android Git Automerger
commit bea42fc5bd
1 changed files with 1 additions and 2 deletions

View File

@ -790,8 +790,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
} }
private boolean isAllowedToLog() { private boolean isAllowedToLog() {
return !mIsPasswordView && !mIsLoggingSuspended && sIsLogging && !mInFeedbackDialog return !mIsPasswordView && !mIsLoggingSuspended && sIsLogging && !mInFeedbackDialog;
&& !isReplaying();
} }
public void requestIndicatorRedraw() { public void requestIndicatorRedraw() {