am 45bbdc20: Merge "Rename variable name to remove ambiguity"

* commit '45bbdc20bb613a84fef35fe685ead394c7b06d57':
  Rename variable name to remove ambiguity
This commit is contained in:
Jatin Matani 2014-12-09 03:59:08 +00:00 committed by Android Git Automerger
commit 3e5c66dbe7

View file

@ -823,14 +823,14 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
int token = 0; int token = 0;
do { do {
// TODO: We need a new API that returns *new* un-synced data. // TODO: We need a new API that returns *new* un-synced data.
final BinaryDictionary.GetNextWordPropertyResult result = final BinaryDictionary.GetNextWordPropertyResult nextWordPropertyResult =
binaryDictionary.getNextWordProperty(token); binaryDictionary.getNextWordProperty(token);
final WordProperty wordProperty = result.mWordProperty; final WordProperty wordProperty = nextWordPropertyResult.mWordProperty;
if (wordProperty == null) { if (wordProperty == null) {
break; break;
} }
wordPropertyList.add(wordProperty); wordPropertyList.add(wordProperty);
token = result.mNextToken; token = nextWordPropertyResult.mNextToken;
} while (token != 0); } while (token != 0);
result.set(wordPropertyList.toArray(new WordProperty[wordPropertyList.size()])); result.set(wordPropertyList.toArray(new WordProperty[wordPropertyList.size()]));
} }