am f5864fbb: am a5bfac5b: Merge "Fix NPE"

* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12':
  Fix NPE
This commit is contained in:
Kurt Partridge 2013-05-15 10:36:37 -07:00 committed by Android Git Automerger
commit 86b2c57c47

View File

@ -894,7 +894,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
// Check that expected word matches. // Check that expected word matches.
if (oldLogUnit != null) { if (oldLogUnit != null) {
final String oldLogUnitWord = oldLogUnit.getWord(); final String oldLogUnitWord = oldLogUnit.getWord();
if (!oldLogUnitWord.equals(expectedWord)) { if (oldLogUnitWord != null && !oldLogUnitWord.equals(expectedWord)) {
return; return;
} }
} }