diff options
| -rw-r--r-- | core/java/android/os/VintfObject.java | 31 | ||||
| -rw-r--r-- | core/jni/android_os_VintfObject.cpp | 76 |
2 files changed, 97 insertions, 10 deletions
diff --git a/core/java/android/os/VintfObject.java b/core/java/android/os/VintfObject.java index 8302eceb772a..65b33e59aa04 100644 --- a/core/java/android/os/VintfObject.java +++ b/core/java/android/os/VintfObject.java @@ -16,14 +16,17 @@ package android.os; -import java.util.ArrayList; +import java.util.Map; import android.util.Log; -/** @hide */ +/** + * Java API for libvintf. + * @hide + */ public class VintfObject { - private static final String LOG_TAG = "VintfObject"; + /// ---------- OTA /** * Slurps all device information (both manifests and both matrices) @@ -45,4 +48,26 @@ public class VintfObject { */ public static native int verify(String[] packageInfo); + /// ---------- CTS Device Info + + /** + * @return a list of HAL names and versions that is supported by this + * device as stated in device and framework manifests. For example, + * ["android.hidl.manager@1.0", "android.hardware.camera.device@1.0", + * "android.hardware.camera.device@3.2"]. There are no duplicates. + */ + public static native String[] getHalNamesAndVersions(); + + /** + * @return the BOARD_SEPOLICY_VERS build flag available in device manifest. + */ + public static native String getSepolicyVersion(); + + /** + * @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"])] + */ + public static native Map<String, String[]> getVndkSnapshots(); } diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index 033f2dfe5173..fa9379ee2075 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp @@ -23,23 +23,34 @@ #include <JNIHelp.h> #include <vintf/VintfObject.h> +#include <vintf/parse_string.h> #include <vintf/parse_xml.h> #include "core_jni_helpers.h" static jclass gString; +static jclass gHashMapClazz; +static jmethodID gHashMapInit; +static jmethodID gHashMapPut; namespace android { +using vintf::HalManifest; +using vintf::SchemaType; using vintf::VintfObject; +using vintf::XmlConverter; +using vintf::Vndk; using vintf::gHalManifestConverter; using vintf::gCompatibilityMatrixConverter; -using vintf::XmlConverter; +using vintf::to_string; -static inline jobjectArray toJavaStringArray(JNIEnv* env, const std::vector<std::string>& v) { +template<typename V> +static inline jobjectArray toJavaStringArray(JNIEnv* env, const V& v) { + size_t i; + typename V::const_iterator it; jobjectArray ret = env->NewObjectArray(v.size(), gString, NULL /* init element */); - for (size_t i = 0; i < v.size(); ++i) { - env->SetObjectArrayElement(ret, i, env->NewStringUTF(v[i].c_str())); + for (i = 0, it = v.begin(); it != v.end(); ++i, ++it) { + env->SetObjectArrayElement(ret, i, env->NewStringUTF(it->c_str())); } return ret; } @@ -55,7 +66,18 @@ static void tryAddSchema(const T* object, const XmlConverter<T>& converter, } } -static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass clazz) +static void tryAddHalNamesAndVersions(const HalManifest *manifest, + const std::string& description, + std::set<std::string> *output) { + if (manifest == nullptr) { + LOG(WARNING) << __FUNCTION__ << "Cannot get " << description; + } else { + auto names = manifest->getHalNamesAndVersions(); + output->insert(names.begin(), names.end()); + } +} + +static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass) { std::vector<std::string> cStrings; @@ -71,7 +93,7 @@ static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass clazz) return toJavaStringArray(env, cStrings); } -static jint android_os_VintfObject_verify(JNIEnv *env, jclass clazz, jobjectArray packageInfo) { +static jint android_os_VintfObject_verify(JNIEnv* env, jclass, jobjectArray packageInfo) { size_t count = env->GetArrayLength(packageInfo); std::vector<std::string> cPackageInfo{count}; for (size_t i = 0; i < count; ++i) { @@ -84,20 +106,60 @@ static jint android_os_VintfObject_verify(JNIEnv *env, jclass clazz, jobjectArra return status; } +static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, jclass) { + std::set<std::string> halNames; + tryAddHalNamesAndVersions(VintfObject::GetDeviceHalManifest(), + "device manifest", &halNames); + tryAddHalNamesAndVersions(VintfObject::GetFrameworkHalManifest(), + "framework manifest", &halNames); + return toJavaStringArray(env, halNames); +} + +static jstring android_os_VintfObject_getSepolicyVersion(JNIEnv* env, jclass) { + const HalManifest *manifest = VintfObject::GetDeviceHalManifest(); + if (manifest == nullptr || manifest->type() != SchemaType::DEVICE) { + LOG(WARNING) << __FUNCTION__ << "Cannot get device manifest"; + return nullptr; + } + std::string cString = to_string(manifest->sepolicyVersion()); + return env->NewStringUTF(cString.c_str()); +} + +static jobject android_os_VintfObject_getVndkSnapshots(JNIEnv* env, jclass) { + const HalManifest *manifest = VintfObject::GetFrameworkHalManifest(); + if (manifest == nullptr || manifest->type() != SchemaType::FRAMEWORK) { + LOG(WARNING) << __FUNCTION__ << "Cannot get framework manifest"; + return nullptr; + } + jobject jMap = env->NewObject(gHashMapClazz, gHashMapInit); + for (const Vndk &vndk : manifest->vndks()) { + std::string key = to_string(vndk.versionRange()); + env->CallObjectMethod(jMap, gHashMapPut, + env->NewStringUTF(key.c_str()), toJavaStringArray(env, vndk.libraries())); + } + return jMap; +} + // ---------------------------------------------------------------------------- static const JNINativeMethod gVintfObjectMethods[] = { {"report", "()[Ljava/lang/String;", (void*)android_os_VintfObject_report}, {"verify", "([Ljava/lang/String;)I", (void*)android_os_VintfObject_verify}, + {"getHalNamesAndVersions", "()[Ljava/lang/String;", (void*)android_os_VintfObject_getHalNamesAndVersions}, + {"getSepolicyVersion", "()Ljava/lang/String;", (void*)android_os_VintfObject_getSepolicyVersion}, + {"getVndkSnapshots", "()Ljava/util/Map;", (void*)android_os_VintfObject_getVndkSnapshots}, }; - const char* const kVintfObjectPathName = "android/os/VintfObject"; int register_android_os_VintfObject(JNIEnv* env) { gString = MakeGlobalRefOrDie(env, FindClassOrDie(env, "java/lang/String")); + gHashMapClazz = MakeGlobalRefOrDie(env, FindClassOrDie(env, "java/util/HashMap")); + gHashMapInit = GetMethodIDOrDie(env, gHashMapClazz, "<init>", "()V"); + gHashMapPut = GetMethodIDOrDie(env, gHashMapClazz, + "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); return RegisterMethodsOrDie(env, kVintfObjectPathName, gVintfObjectMethods, NELEM(gVintfObjectMethods)); |