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

Commit 1476e0fa authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Merge "Fix ownership of objects returned by VintfObject::Get*" am:... 

Merge "Merge "Fix ownership of objects returned by VintfObject::Get*" am: 2cdd1ce6 am: 56d8c829 am: b519119e" into oc-mr1-dev-plus-aosp
am: 7d9492ee

Change-Id: I2c25a6f8113a4bbcb2a083a8a46da75a03f40464
parents 9df79f6a 7d9492ee

core/jni/android_os_VintfObject.cpp

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static inline jobjectArray toJavaStringArray(JNIEnv* env, const V& v) { 
}



template<typename T>

static void tryAddSchema(const T* object, const XmlConverter<T>& converter,

static void tryAddSchema(const std::shared_ptr<const T>& object, const XmlConverter<T>& converter,

        const std::string& description,

        std::vector<std::string>* cStrings) {

    if (object == nullptr) {
@@ -66,7 +66,7 @@ static void tryAddSchema(const T* object, const XmlConverter<T>& converter, 
    }

}



static void tryAddHalNamesAndVersions(const HalManifest *manifest,

static void tryAddHalNamesAndVersions(const std::shared_ptr<const HalManifest>& manifest,

        const std::string& description,

        std::set<std::string> *output) {

    if (manifest == nullptr) {
@@ -119,7 +119,7 @@ static jobjectArray android_os_VintfObject_getHalNamesAndVersions(JNIEnv* env, j 
}



static jstring android_os_VintfObject_getSepolicyVersion(JNIEnv* env, jclass) {

    const HalManifest *manifest = VintfObject::GetDeviceHalManifest();

    std::shared_ptr<const HalManifest> manifest = VintfObject::GetDeviceHalManifest();

    if (manifest == nullptr || manifest->type() != SchemaType::DEVICE) {

        LOG(WARNING) << __FUNCTION__ << "Cannot get device manifest";

        return nullptr;
@@ -129,7 +129,7 @@ static jstring android_os_VintfObject_getSepolicyVersion(JNIEnv* env, jclass) { 
}



static jobject android_os_VintfObject_getVndkSnapshots(JNIEnv* env, jclass) {

    const HalManifest *manifest = VintfObject::GetFrameworkHalManifest();

    std::shared_ptr<const HalManifest> manifest = VintfObject::GetFrameworkHalManifest();

    if (manifest == nullptr || manifest->type() != SchemaType::FRAMEWORK) {

        LOG(WARNING) << __FUNCTION__ << "Cannot get framework manifest";

        return nullptr;

core/jni/android_os_VintfRuntimeInfo.cpp

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ using vintf::VintfObject; 
#define MAP_STRING_METHOD(javaMethod, cppString)                                       \

    static jstring android_os_VintfRuntimeInfo_##javaMethod(JNIEnv* env, jclass clazz) \

    {                                                                                  \

        const RuntimeInfo *info = VintfObject::GetRuntimeInfo();                       \

        std::shared_ptr<const RuntimeInfo> info = VintfObject::GetRuntimeInfo();       \

        if (info == nullptr) return nullptr;                                           \

        return env->NewStringUTF((cppString).c_str());                                 \

    }                                                                                  \
@@ -50,7 +50,7 @@ MAP_STRING_METHOD(getBootVbmetaAvbVersion, vintf::to_string(info->bootVbmetaAvbV 


static jlong android_os_VintfRuntimeInfo_getKernelSepolicyVersion(JNIEnv *env, jclass clazz)

{

    const RuntimeInfo *info = VintfObject::GetRuntimeInfo();

    std::shared_ptr<const RuntimeInfo> info = VintfObject::GetRuntimeInfo();

    if (info == nullptr) return 0;

    return static_cast<jlong>(info->kernelSepolicyVersion());

}