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

Commit e8456d8d authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "VintfObject: use toXml."

parents 328518b0 f4f69971

core/jni/android_os_VintfObject.cpp

+12 −17
Original line number Diff line number Diff line
@@ -40,12 +40,10 @@ namespace android { 
using vintf::HalManifest;

using vintf::Level;

using vintf::SchemaType;

using vintf::to_string;

using vintf::toXml;

using vintf::VintfObject;

using vintf::XmlConverter;

using vintf::Vndk;

using vintf::gHalManifestConverter;

using vintf::gCompatibilityMatrixConverter;

using vintf::to_string;



template<typename V>

static inline jobjectArray toJavaStringArray(JNIEnv* env, const V& v) {
@@ -59,13 +57,12 @@ static inline jobjectArray toJavaStringArray(JNIEnv* env, const V& v) { 
}



template <typename T>

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

        const std::string& description,

static void tryAddSchema(const std::shared_ptr<const T>& object, const std::string& description,

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

    if (object == nullptr) {

        LOG(WARNING) << __FUNCTION__ << "Cannot get " << description;

    } else {

        cStrings->push_back(converter(*object));

        cStrings->push_back(toXml(*object));

    }

}
@@ -84,14 +81,12 @@ static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass) 
{

    std::vector<std::string> cStrings;



    tryAddSchema(VintfObject::GetDeviceHalManifest(), gHalManifestConverter,

            "device manifest", &cStrings);

    tryAddSchema(VintfObject::GetFrameworkHalManifest(), gHalManifestConverter,

            "framework manifest", &cStrings);

    tryAddSchema(VintfObject::GetDeviceCompatibilityMatrix(), gCompatibilityMatrixConverter,

            "device compatibility matrix", &cStrings);

    tryAddSchema(VintfObject::GetFrameworkCompatibilityMatrix(), gCompatibilityMatrixConverter,

            "framework compatibility matrix", &cStrings);

    tryAddSchema(VintfObject::GetDeviceHalManifest(), "device manifest", &cStrings);

    tryAddSchema(VintfObject::GetFrameworkHalManifest(), "framework manifest", &cStrings);

    tryAddSchema(VintfObject::GetDeviceCompatibilityMatrix(), "device compatibility matrix",

                 &cStrings);

    tryAddSchema(VintfObject::GetFrameworkCompatibilityMatrix(), "framework compatibility matrix",

                 &cStrings);



    return toJavaStringArray(env, cStrings);

}