Merge "Renaming "blacklist" flag to "possibly offensive"" (c51b9b5b) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public final class BinaryDictionary extends Dictionary {
		// Format to get unigram flags from native side via getWordPropertyNative().
		private static final int FORMAT_WORD_PROPERTY_OUTPUT_FLAG_COUNT = 5;
		private static final int FORMAT_WORD_PROPERTY_IS_NOT_A_WORD_INDEX = 0;
		private static final int FORMAT_WORD_PROPERTY_IS_BLACKLISTED_INDEX = 1;
		private static final int FORMAT_WORD_PROPERTY_IS_POSSIBLY_OFFENSIVE_INDEX = 1;
		private static final int FORMAT_WORD_PROPERTY_HAS_NGRAMS_INDEX = 2;
		private static final int FORMAT_WORD_PROPERTY_HAS_SHORTCUTS_INDEX = 3;
		private static final int FORMAT_WORD_PROPERTY_IS_BEGINNING_OF_SENTENCE_INDEX = 4;
		@@ -195,7 +195,7 @@ public final class BinaryDictionary extends Dictionary {
		float[] inOutWeightOfLangModelVsSpatialModel);
		private static native boolean addUnigramEntryNative(long dict, int[] word, int probability,
		int[] shortcutTarget, int shortcutProbability, boolean isBeginningOfSentence,
		boolean isNotAWord, boolean isBlacklisted, int timestamp);
		boolean isNotAWord, boolean isPossiblyOffensive, int timestamp);
		private static native boolean removeUnigramEntryNative(long dict, int[] word);
		private static native boolean addNgramEntryNative(long dict,
		int[][] prevWordCodePointArrays, boolean[] isBeginningOfSentenceArray,
		@@ -402,7 +402,7 @@ public final class BinaryDictionary extends Dictionary {
		outNgramProbabilityInfo, outShortcutTargets, outShortcutProbabilities);
		return new WordProperty(codePoints,
		outFlags[FORMAT_WORD_PROPERTY_IS_NOT_A_WORD_INDEX],
		outFlags[FORMAT_WORD_PROPERTY_IS_BLACKLISTED_INDEX],
		outFlags[FORMAT_WORD_PROPERTY_IS_POSSIBLY_OFFENSIVE_INDEX],
		outFlags[FORMAT_WORD_PROPERTY_HAS_NGRAMS_INDEX],
		outFlags[FORMAT_WORD_PROPERTY_HAS_SHORTCUTS_INDEX],
		outFlags[FORMAT_WORD_PROPERTY_IS_BEGINNING_OF_SENTENCE_INDEX], outProbabilityInfo,
		@@ -439,7 +439,7 @@ public final class BinaryDictionary extends Dictionary {
		public boolean addUnigramEntry(final String word, final int probability,
		final String shortcutTarget, final int shortcutProbability,
		final boolean isBeginningOfSentence, final boolean isNotAWord,
		final boolean isBlacklisted, final int timestamp) {
		final boolean isPossiblyOffensive, final int timestamp) {
		if (word == null \|\| (word.isEmpty() && !isBeginningOfSentence)) {
		return false;
		}
		@@ -447,7 +447,8 @@ public final class BinaryDictionary extends Dictionary {
		final int[] shortcutTargetCodePoints = (shortcutTarget != null) ?
		StringUtils.toCodePointArray(shortcutTarget) : null;
		if (!addUnigramEntryNative(mNativeDict, codePoints, probability, shortcutTargetCodePoints,
		shortcutProbability, isBeginningOfSentence, isNotAWord, isBlacklisted, timestamp)) {
		shortcutProbability, isBeginningOfSentence, isNotAWord, isPossiblyOffensive,
		timestamp)) {
		return false;
		}
		mHasUpdated = true;

java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
		}
		runGCIfRequiredLocked(true /* mindsBlockByGC */);
		addUnigramLocked(word, FREQUENCY_FOR_CONTACTS, null /* shortcut */,
		0 /* shortcutFreq /, false / isNotAWord /, false / isBlacklisted */,
		0 /* shortcutFreq /, false / isNotAWord /, false / isPossiblyOffensive */,
		BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		}
		}
		@@ -238,7 +238,8 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
		runGCIfRequiredLocked(true /* mindsBlockByGC */);
		addUnigramLocked(word, FREQUENCY_FOR_CONTACTS,
		null /* shortcut /, 0 / shortcutFreq /, false / isNotAWord */,
		false /* isBlacklisted */, BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		false /* isPossiblyOffensive */,
		BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		if (!ngramContext.isValid() && mUseFirstLastBigrams) {
		runGCIfRequiredLocked(true /* mindsBlockByGC */);
		addNgramEntryLocked(ngramContext, word, FREQUENCY_FOR_CONTACTS_BIGRAM,

java/src/com/android/inputmethod/latin/DictionaryFacilitator.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -809,7 +809,7 @@ public class DictionaryFacilitator {
		contextualDict.addUnigramEntryWithCheckingDistracter(
		subPhraseStr, probability, null /* shortcutTarget */,
		Dictionary.NOT_A_PROBABILITY /* shortcutFreq */,
		false /* isNotAWord /, false / isBlacklisted */,
		false /* isNotAWord /, false / isPossiblyOffensive */,
		BinaryDictionary.NOT_A_VALID_TIMESTAMP,
		DistracterFilter.EMPTY_DISTRACTER_FILTER);
		contextualDict.addNgramEntry(ngramContext, subPhraseStr,
		@@ -819,7 +819,7 @@ public class DictionaryFacilitator {
		contextualDict.addUnigramEntryWithCheckingDistracter(
		phrase[i], probability, null /* shortcutTarget */,
		Dictionary.NOT_A_PROBABILITY /* shortcutFreq */,
		false /* isNotAWord /, false / isBlacklisted */,
		false /* isNotAWord /, false / isPossiblyOffensive */,
		BinaryDictionary.NOT_A_VALID_TIMESTAMP,
		DistracterFilter.EMPTY_DISTRACTER_FILTER);
		contextualDict.addNgramEntry(ngramContext, phrase[i],

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -316,22 +316,22 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		*/
		public void addUnigramEntryWithCheckingDistracter(final String word, final int frequency,
		final String shortcutTarget, final int shortcutFreq, final boolean isNotAWord,
		final boolean isBlacklisted, final int timestamp,
		final boolean isPossiblyOffensive, final int timestamp,
		@Nonnull final DistracterFilter distracterFilter) {
		updateDictionaryWithWriteLockIfWordIsNotADistracter(new Runnable() {
		@Override
		public void run() {
		addUnigramLocked(word, frequency, shortcutTarget, shortcutFreq,
		isNotAWord, isBlacklisted, timestamp);
		isNotAWord, isPossiblyOffensive, timestamp);
		}
		}, word, distracterFilter);
		}

		protected void addUnigramLocked(final String word, final int frequency,
		final String shortcutTarget, final int shortcutFreq, final boolean isNotAWord,
		final boolean isBlacklisted, final int timestamp) {
		final boolean isPossiblyOffensive, final int timestamp) {
		if (!mBinaryDictionary.addUnigramEntry(word, frequency, shortcutTarget, shortcutFreq,
		false /* isBeginningOfSentence */, isNotAWord, isBlacklisted, timestamp)) {
		false /* isBeginningOfSentence */, isNotAWord, isPossiblyOffensive, timestamp)) {
		Log.e(TAG, "Cannot add unigram entry. word: " + word);
		}
		}

java/src/com/android/inputmethod/latin/UserBinaryDictionary.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -257,12 +257,14 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
		runGCIfRequiredLocked(true /* mindsBlockByGC */);
		addUnigramLocked(word, adjustedFrequency, null /* shortcutTarget */,
		0 /* shortcutFreq /, false / isNotAWord */,
		false /* isBlacklisted */, BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		false /* isPossiblyOffensive */,
		BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		if (null != shortcut && shortcut.length() <= MAX_WORD_LENGTH) {
		runGCIfRequiredLocked(true /* mindsBlockByGC */);
		addUnigramLocked(shortcut, adjustedFrequency, word,
		USER_DICT_SHORTCUT_FREQUENCY, true /* isNotAWord */,
		false /* isBlacklisted */, BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		false /* isPossiblyOffensive */,
		BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		}
		}
		cursor.moveToNext();