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

Commit a2d5162e authored by Makoto Onuki's avatar Makoto Onuki
Browse files

[LayoutlibLoader] Allow to skip ICU / Keyboard initialization 

ICU and keyboard configuration parameters are passed from the Java side
using java properties.

We now skip these initializations if the properties are "**n/a**",
and do this on Ravenwood, where ICU and keyboard couldn't be initialized
as of now.

We use a magic value "**n/a**" rather than "", in case "" is already
special cased somehow somewhere.

Bug: 318393625
Test: tree hugger
Test: Tested on the ravenwood prototype branch
Change-Id: Ib3e8925222daf4f092ecf391fe70999a91edd6c0
parent a60c144b

core/jni/LayoutlibLoader.cpp

+19 −7
Original line number Diff line number Diff line
@@ -416,11 +416,17 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { 
                                                           env->NewStringUTF("icu.data.path"),

                                                           env->NewStringUTF(""));

    const char* path = env->GetStringUTFChars(stringPath, 0);



    if (strcmp(path, "**n/a**") != 0) {

        bool icuInitialized = init_icu(path);

    env->ReleaseStringUTFChars(stringPath, path);

        if (!icuInitialized) {

            fprintf(stderr, "Failed to initialize ICU\n");

            return JNI_ERR;

        }

    } else {

        fprintf(stderr, "Skip initializing ICU\n");

    }

    env->ReleaseStringUTFChars(stringPath, path);



    jstring useJniProperty =

            (jstring)env->CallStaticObjectMethod(system, getPropertyMethod,
@@ -449,12 +455,18 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { 
    // Use English locale for number format to ensure correct parsing of floats when using strtof

    setlocale(LC_NUMERIC, "en_US.UTF-8");



    auto keyboardPathsString =

    auto keyboardPathsJString =

            (jstring)env->CallStaticObjectMethod(system, getPropertyMethod,

                                                 env->NewStringUTF("keyboard_paths"),

                                                 env->NewStringUTF(""));

    vector<string> keyboardPaths = parseCsv(env, keyboardPathsString);

    const char* keyboardPathsString = env->GetStringUTFChars(keyboardPathsJString, 0);

    if (strcmp(keyboardPathsString, "**n/a**") != 0) {

        vector<string> keyboardPaths = parseCsv(env, keyboardPathsJString);

        init_keyboard(env, keyboardPaths);

    } else {

        fprintf(stderr, "Skip initializing keyboard\n");

    }

    env->ReleaseStringUTFChars(keyboardPathsJString, keyboardPathsString);



    return JNI_VERSION_1_6;

}