commit 8f1aba2e25837a7737ab463f6580b6238407a635
author Yohei Yukawa <yukawa@google.com> Mon Mar 24 14:21:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 24 14:21:27 2014 +0000
tree 5537e61618066bed12b89cc344b115f65e622a46
parent cf88cf65936962373797d14694011b15d0f4c5f0
parent f1f5ed542d43566f30e9f03f98de9bef717465ce

Merge "Check null before passing to Integer.parseInt"

native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp

diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp
index bac4d4e..c7d3df9 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp
@@ -72,7 +72,8 @@
     const int elapsedTimeStepCount = getElapsedTimeStepCount(historicalInfo->getTimeStamp(),
             headerPolicy->getForgettingCurveDurationToLevelDown());
     return sProbabilityTable.getProbability(
-            headerPolicy->getForgettingCurveProbabilityValuesTableId(), historicalInfo->getLevel(),
+            headerPolicy->getForgettingCurveProbabilityValuesTableId(),
+            std::min(std::max(historicalInfo->getLevel(), 0), MAX_LEVEL),
             std::min(std::max(elapsedTimeStepCount, 0), MAX_ELAPSED_TIME_STEP_COUNT));
 }