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

Commit eac8c121 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "android.os.VintfObject: update for VNDK version format change."

parents c9082cec 8da8798c

core/java/android/os/VintfObject.java

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ public class VintfObject { 
    /**

     * @return a list of VNDK snapshots supported by the framework, as

     * specified in framework manifest. For example,

     * [("25.0.5", ["libjpeg.so", "libbase.so"]),

     *  ("25.1.3", ["libjpeg.so", "libbase.so"])]

     * [("27", ["libjpeg.so", "libbase.so"]),

     *  ("28", ["libjpeg.so", "libbase.so"])]

     */

    public static native Map<String, String[]> getVndkSnapshots();

}

core/jni/android_os_VintfObject.cpp

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ static jobject android_os_VintfObject_getVndkSnapshots(JNIEnv* env, jclass) { 
        return nullptr;

    }

    jobject jMap = env->NewObject(gHashMapClazz, gHashMapInit);

    for (const Vndk &vndk : manifest->vndks()) {

        std::string key = to_string(vndk.versionRange());

    for (const auto &vndk : manifest->vendorNdks()) {

        std::string key = vndk.version();

        env->CallObjectMethod(jMap, gHashMapPut,

                env->NewStringUTF(key.c_str()), toJavaStringArray(env, vndk.libraries()));

    }