From 8da8798ca3cf8e45c6105b9c86be2c262be6f817 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 10 Jan 2018 16:04:18 -0800 Subject: android.os.VintfObject: update for VNDK version format change. Test: CTS device info collect Bug: 36400653 Change-Id: I7b22f82ddd9ddc3b0930b5c1564435c42be2a6fa --- core/java/android/os/VintfObject.java | 4 ++-- core/jni/android_os_VintfObject.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/os/VintfObject.java b/core/java/android/os/VintfObject.java index 340f3fb8cd25..12a495bf2821 100644 --- a/core/java/android/os/VintfObject.java +++ b/core/java/android/os/VintfObject.java @@ -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 getVndkSnapshots(); } diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index 1eeea517cd78..16591685848e 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp @@ -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())); } -- cgit v1.2.3-59-g8ed1b