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

Commit 571816b9 authored by Steve Kondik's avatar Steve Kondik Committed by Alberto97
Browse files

LatinIME: Add fallback loader for JNI lib

Prefer the JNI lib with gesture typing support.
If not available / installed fall back to the standard one without
geture typing.

Change-Id: I70a5f43386a9c72809a70bd286f3702378d6f9be
parent abb4a7f2
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -22,4 +22,5 @@ public final class JniLibName {
    }
    }


    public static final String JNI_LIB_NAME = "jni_latinime";
    public static final String JNI_LIB_NAME = "jni_latinime";
    public static final String JNI_LIB_NAME2 = "jni_latinimegoogle";
}
}
+8 −3
Original line number Original line Diff line number Diff line
@@ -24,12 +24,17 @@ public final class JniUtils {
    private static final String TAG = JniUtils.class.getSimpleName();
    private static final String TAG = JniUtils.class.getSimpleName();


    static {
    static {
        try {
            System.loadLibrary(JniLibName.JNI_LIB_NAME2);
        } catch (UnsatisfiedLinkError ue) {
            Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME2, ue);
            try {
            try {
                System.loadLibrary(JniLibName.JNI_LIB_NAME);
                System.loadLibrary(JniLibName.JNI_LIB_NAME);
            } catch (UnsatisfiedLinkError ule) {
            } catch (UnsatisfiedLinkError ule) {
                Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME, ule);
                Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME, ule);
            }
            }
        }
        }
    }


    private JniUtils() {
    private JniUtils() {
        // This utility class is not publicly instantiable.
        // This utility class is not publicly instantiable.