Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32bdf9f3 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Use JniDataUtils::putXxxToArray() to output a value."

parents 5c00bde9 304a71d1

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+4 −6
Original line number Diff line number Diff line
@@ -136,10 +136,9 @@ static void latinime_BinaryDictionary_getHeaderInfo(JNIEnv *env, jclass clazz, j 
    if (!dictionary) return;

    const DictionaryHeaderStructurePolicy *const headerPolicy =

            dictionary->getDictionaryStructurePolicy()->getHeaderStructurePolicy();

    const int headerSize = headerPolicy->getSize();

    env->SetIntArrayRegion(outHeaderSize, 0 /* start */, 1 /* len */, &headerSize);

    const int formatVersion = headerPolicy->getFormatVersionNumber();

    env->SetIntArrayRegion(outFormatVersion, 0 /* start */, 1 /* len */, &formatVersion);

    JniDataUtils::putIntToArray(env, outHeaderSize, 0 /* index */, headerPolicy->getSize());

    JniDataUtils::putIntToArray(env, outFormatVersion, 0 /* index */,

            headerPolicy->getFormatVersionNumber());

    // Output attribute map

    jclass arrayListClass = env->FindClass("java/util/ArrayList");

    jmethodID addMethodId = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
@@ -184,8 +183,7 @@ static void latinime_BinaryDictionary_getSuggestions(JNIEnv *env, jclass clazz, 
        jfloatArray inOutLanguageWeight) {

    Dictionary *dictionary = reinterpret_cast<Dictionary *>(dict);

    // Assign 0 to outSuggestionCount here in case of returning earlier in this method.

    int count = 0;

    env->SetIntArrayRegion(outSuggestionCount, 0, 1 /* len */, &count);

    JniDataUtils::putIntToArray(env, outSuggestionCount, 0 /* index */, 0);

    if (!dictionary) {

        return;

    }

native/jni/src/suggest/core/result/suggestion_results.cpp

+8 −13
Original line number Diff line number Diff line
@@ -32,24 +32,19 @@ void SuggestionResults::outputSuggestions(JNIEnv *env, jintArray outSuggestionCo 
        JniDataUtils::outputCodePoints(env, outputCodePointsArray, start,

                MAX_WORD_LENGTH /* maxLength */, suggestedWord.getCodePoint(),

                suggestedWord.getCodePointCount(), true /* needsNullTermination */);

        const int score = suggestedWord.getScore();

        env->SetIntArrayRegion(outScoresArray, outputIndex, 1 /* len */, &score);

        const int indexToPartialCommit = suggestedWord.getIndexToPartialCommit();

        env->SetIntArrayRegion(outSpaceIndicesArray, outputIndex, 1 /* len */,

                &indexToPartialCommit);

        const int type = suggestedWord.getType();

        env->SetIntArrayRegion(outTypesArray, outputIndex, 1 /* len */, &type);

        JniDataUtils::putIntToArray(env, outScoresArray, outputIndex, suggestedWord.getScore());

        JniDataUtils::putIntToArray(env, outSpaceIndicesArray, outputIndex,

                suggestedWord.getIndexToPartialCommit());

        JniDataUtils::putIntToArray(env, outTypesArray, outputIndex, suggestedWord.getType());

        if (mSuggestedWords.size() == 1) {

            const int autoCommitFirstWordConfidence =

                    suggestedWord.getAutoCommitFirstWordConfidence();

            env->SetIntArrayRegion(outAutoCommitFirstWordConfidenceArray, 0 /* start */,

                    1 /* len */, &autoCommitFirstWordConfidence);

            JniDataUtils::putIntToArray(env, outAutoCommitFirstWordConfidenceArray, 0 /* index */,

                    suggestedWord.getAutoCommitFirstWordConfidence());

        }

        ++outputIndex;

        mSuggestedWords.pop();

    }

    env->SetIntArrayRegion(outSuggestionCount, 0 /* start */, 1 /* len */, &outputIndex);

    env->SetFloatArrayRegion(outLanguageWeight, 0 /* start */, 1 /* len */, &mLanguageWeight);

    JniDataUtils::putIntToArray(env, outSuggestionCount, 0 /* index */, outputIndex);

    JniDataUtils::putFloatToArray(env, outLanguageWeight, 0 /* index */, mLanguageWeight);

}



void SuggestionResults::addPrediction(const int *const codePoints, const int codePointCount,

native/jni/src/utils/jni_data_utils.h

+9 −0
Original line number Diff line number Diff line
@@ -90,6 +90,15 @@ class JniDataUtils { 
        }

    }



    static void putIntToArray(JNIEnv *env, jintArray array, const int index, const int value) {

        env->SetIntArrayRegion(array, index, 1 /* len */, &value);

    }



    static void putFloatToArray(JNIEnv *env, jfloatArray array, const int index,

            const float value) {

        env->SetFloatArrayRegion(array, index, 1 /* len */, &value);

    }



 private:

    DISALLOW_IMPLICIT_CONSTRUCTORS(JniDataUtils);