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

Commit ae049da6 authored by Michael Hoisie's avatar Michael Hoisie Committed by Android (Google) Code Review
Browse files

Merge "Print an informative message when trying to register an unsupported class" into main

parents b77c082e cb2d94a9

core/jni/platform/host/HostRuntime.cpp

+8 −2
Original line number Diff line number Diff line
@@ -157,8 +157,14 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = { 
static int register_jni_procs(const std::unordered_map<std::string, RegJNIRec>& jniRegMap,

                              const vector<string>& classesToRegister, JNIEnv* env) {

    for (const string& className : classesToRegister) {

        if (jniRegMap.at(className).mProc(env) < 0) {

            return -1;

        auto it = jniRegMap.find(className);

        if (it == jniRegMap.end()) {

            fprintf(stderr, "Missing registration function for %s\n", className.c_str());

            return JNI_ERR;

        }

        if (it->second.mProc(env) < 0) {

            fprintf(stderr, "Failed to register class %s\n", className.c_str());

            return JNI_ERR;

        }

    }

libs/hwui/apex/LayoutlibLoader.cpp

+8 −2
Original line number Diff line number Diff line
@@ -160,8 +160,14 @@ static int register_jni_procs(const std::unordered_map<std::string, RegJNIRec>& 
        const vector<string>& classesToRegister, JNIEnv* env) {



    for (const string& className : classesToRegister) {

        if (jniRegMap.at(className).mProc(env) < 0) {

            return -1;

        auto it = jniRegMap.find(className);

        if (it == jniRegMap.end()) {

            fprintf(stderr, "Missing registration function for %s\n", className.c_str());

            return JNI_ERR;

        }

        if (it->second.mProc(env) < 0) {

            fprintf(stderr, "Failed to register class %s\n", className.c_str());

            return JNI_ERR;

        }

    }

    return 0;