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

Commit 5444011e authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Automerger Merge Worker
Browse files

Merge "StatsAIDL: eliminated extra reverseDomainName string copy creation" am:... 

Merge "StatsAIDL: eliminated extra reverseDomainName string copy creation" am: 30ec4430 am: dfbf9224

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



Change-Id: I57d486523cbbaa184cb34d6f2bde165b35975df6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffd13f00 dfbf9224

services/stats/StatsAidl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ namespace stats { 
StatsHal::StatsHal() {}



ndk::ScopedAStatus StatsHal::reportVendorAtom(const VendorAtom& vendorAtom) {

    std::string reverseDomainName = (std::string) vendorAtom.reverseDomainName;

    if (vendorAtom.atomId < 100000 || vendorAtom.atomId >= 200000) {

        ALOGE("Atom ID %ld is not a valid vendor atom ID", (long) vendorAtom.atomId);

        return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(

            -1, "Not a valid vendor atom ID");

    }

    if (reverseDomainName.length() > 50) {

        ALOGE("Vendor atom reverse domain name %s is too long.", reverseDomainName.c_str());

    if (vendorAtom.reverseDomainName.length() > 50) {

        ALOGE("Vendor atom reverse domain name %s is too long.",

            vendorAtom.reverseDomainName.c_str());

        return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(

            -1, "Vendor atom reverse domain name is too long");

    }