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

Commit 53eb159d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Skip logging error when service name doesn't match vintf format" into... 

Merge "Skip logging error when service name doesn't match vintf format" into main am: 616edb5a am: 2b03a596

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3190334



Change-Id: I4bab35710b67ffa99be3966fad997ad05f0bbfbc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97a297e9 2b03a596

cmds/servicemanager/ServiceManager.cpp

+10 −8
Original line number Diff line number Diff line
@@ -112,13 +112,15 @@ struct AidlName { 
    std::string iface;

    std::string instance;



    static bool fill(const std::string& name, AidlName* aname) {

    static bool fill(const std::string& name, AidlName* aname, bool logError) {

        size_t firstSlash = name.find('/');

        size_t lastDot = name.rfind('.', firstSlash);

        if (firstSlash == std::string::npos || lastDot == std::string::npos) {

            if (logError) {

                ALOGE("VINTF HALs require names in the format type/instance (e.g. "

                      "some.package.foo.IFoo/default) but got: %s",

                      name.c_str());

            }

            return false;

        }

        aname->package = name.substr(0, lastDot);
@@ -151,7 +153,7 @@ static bool isVintfDeclared(const Access::CallingContext& ctx, const std::string 
    }



    AidlName aname;

    if (!AidlName::fill(name, &aname)) return false;

    if (!AidlName::fill(name, &aname, true)) return false;



    bool found = forEachManifest([&](const ManifestWithDescription& mwd) {

        if (mwd.manifest->hasAidlInstance(aname.package, aname.iface, aname.instance)) {
@@ -209,7 +211,7 @@ static std::optional<std::string> getVintfUpdatableApex(const std::string& name) 
    }



    AidlName aname;

    if (!AidlName::fill(name, &aname)) return std::nullopt;

    if (!AidlName::fill(name, &aname, true)) return std::nullopt;



    std::optional<std::string> updatableViaApex;
@@ -251,7 +253,7 @@ static std::vector<std::string> getVintfUpdatableNames(const std::string& apexNa 


static std::optional<std::string> getVintfAccessorName(const std::string& name) {

    AidlName aname;

    if (!AidlName::fill(name, &aname)) return std::nullopt;

    if (!AidlName::fill(name, &aname, false)) return std::nullopt;



    std::optional<std::string> accessor;

    forEachManifest([&](const ManifestWithDescription& mwd) {
@@ -270,7 +272,7 @@ static std::optional<std::string> getVintfAccessorName(const std::string& name) 


static std::optional<ConnectionInfo> getVintfConnectionInfo(const std::string& name) {

    AidlName aname;

    if (!AidlName::fill(name, &aname)) return std::nullopt;

    if (!AidlName::fill(name, &aname, true)) return std::nullopt;



    std::optional<std::string> ip;

    std::optional<uint64_t> port;