diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-04-11 22:21:10 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 22:21:10 -0700 |
| commit | 2daea19709cd6c9d844d9ad77076256e2f3967ad (patch) | |
| tree | 440acf089f590bd66058d359637920255139d94c | |
| parent | d0623ad7f3dd22cd9e3a8ee836d8989b6425a438 (diff) | |
| parent | 47bb8d7d9cd2dcc8e80f90283e4d9b7d4f68e70b (diff) | |
| download | latinime-2daea19709cd6c9d844d9ad77076256e2f3967ad.tar.gz latinime-2daea19709cd6c9d844d9ad77076256e2f3967ad.tar.xz latinime-2daea19709cd6c9d844d9ad77076256e2f3967ad.zip | |
am 47bb8d7d: am 4fffa27d: Fix a native crash in AOSP LatinIME
* commit '47bb8d7d9cd2dcc8e80f90283e4d9b7d4f68e70b':
Fix a native crash in AOSP LatinIME
| -rw-r--r-- | native/jni/src/suggest/core/suggest.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native/jni/src/suggest/core/suggest.h b/native/jni/src/suggest/core/suggest.h index 136c4e548..becd6c1de 100644 --- a/native/jni/src/suggest/core/suggest.h +++ b/native/jni/src/suggest/core/suggest.h @@ -42,8 +42,9 @@ class Weighting; class Suggest : public SuggestInterface { public: AK_FORCE_INLINE Suggest(const SuggestPolicy *const suggestPolicy) - : TRAVERSAL(suggestPolicy->getTraversal()), - SCORING(suggestPolicy->getScoring()), WEIGHTING(suggestPolicy->getWeighting()) {} + : TRAVERSAL(suggestPolicy ? suggestPolicy->getTraversal() : 0), + SCORING(suggestPolicy ? suggestPolicy->getScoring() : 0), + WEIGHTING(suggestPolicy ? suggestPolicy->getWeighting() : 0) {} AK_FORCE_INLINE virtual ~Suggest() {} int getSuggestions(ProximityInfo *pInfo, void *traverseSession, int *inputXs, int *inputYs, int *times, int *pointerIds, int *inputCodePoints, int inputSize, int commitPoint, |