Merge "Fix: ProbabilityDictContent can be wrongly large." (ff27bcad) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.cpp

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -74,8 +74,8 @@ bool ProbabilityDictContent::setProbabilityEntry(const int terminalId,
	return false;		return false;
	}		}
	writingPos += getEntrySize();		writingPos += getEntrySize();
	mSize++;
	}		}
			mSize = terminalId + 1;
	}		}
	return writeEntry(probabilityEntry, entryPos);		return writeEntry(probabilityEntry, entryPos);
	}		}
	@@ -100,7 +100,6 @@ bool ProbabilityDictContent::flushToFile(const char *const dictPath) const {
	bool ProbabilityDictContent::runGC(		bool ProbabilityDictContent::runGC(
	const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,		const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,
	const ProbabilityDictContent *const originalProbabilityDictContent) {		const ProbabilityDictContent *const originalProbabilityDictContent) {
	mSize = 0;
	for (TerminalPositionLookupTable::TerminalIdMap::const_iterator it = terminalIdMap->begin();		for (TerminalPositionLookupTable::TerminalIdMap::const_iterator it = terminalIdMap->begin();
	it != terminalIdMap->end(); ++it) {		it != terminalIdMap->end(); ++it) {
	const ProbabilityEntry probabilityEntry =		const ProbabilityEntry probabilityEntry =
	@@ -109,7 +108,6 @@ bool ProbabilityDictContent::runGC(
	AKLOGE("Cannot set probability entry in runGC. terminalId: %d", it->second);		AKLOGE("Cannot set probability entry in runGC. terminalId: %d", it->second);
	return false;		return false;
	}		}
	mSize++;
	}		}
	return true;		return true;
	}		}