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

Commit aaefc4b3 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Yet another small cleanups 

Change-Id: Ie940c4d4d9d85c95e2f04ba23f00a54ba3dc53bf
parent a10b1a88

native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011, The Android Open Source Project

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+2 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009, The Android Open Source Project

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 */





#include <cstring> // for memset()



#define LOG_TAG "LatinIME: jni: BinaryDictionary"

native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012, The Android Open Source Project

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

native/jni/jni_common.cpp

+14 −21
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011, The Android Open Source Project

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -25,45 +25,38 @@ 
#include "jni.h"

#include "jni_common.h"



using namespace latinime;



/*

 * Returns the JNI version on success, -1 on failure.

 */

jint JNI_OnLoad(JavaVM *vm, void *reserved) {

    JNIEnv *env = 0;

    jint result = -1;



    if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {

        AKLOGE("ERROR: GetEnv failed");

        goto bail;

        return -1;

    }

    assert(env);



    if (!register_BinaryDictionary(env)) {

    if (!env) {

        AKLOGE("ERROR: JNIEnv is invalid");

        return -1;

    }

    if (!latinime::register_BinaryDictionary(env)) {

        AKLOGE("ERROR: BinaryDictionary native registration failed");

        goto bail;

        return -1;

    }



    if (!register_DicTraverseSession(env)) {

    if (!latinime::register_DicTraverseSession(env)) {

        AKLOGE("ERROR: DicTraverseSession native registration failed");

        goto bail;

        return -1;

    }



    if (!register_ProximityInfo(env)) {

    if (!latinime::register_ProximityInfo(env)) {

        AKLOGE("ERROR: ProximityInfo native registration failed");

        goto bail;

        return -1;

    }



    /* success -- return valid version number */

    result = JNI_VERSION_1_6;



bail:

    return result;

    return JNI_VERSION_1_6;

}



namespace latinime {



int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods,

        int numMethods) {

    jclass clazz = env->FindClass(className);

native/jni/com_android_inputmethod_latin_BinaryDictionary.h

+1 −1

File changed.

Contains only whitespace changes.

native/jni/com_android_inputmethod_latin_DicTraverseSession.h

+1 −1

File changed.

Contains only whitespace changes.

native/jni/com_android_inputmethod_keyboard_ProximityInfo.h

+1 −1

File changed.

Contains only whitespace changes.