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

Commit 4cffb7d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [security]" into main am: f6468326 am: 7eb27056 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723317



Change-Id: I29ec101adb3a8ed93ee3ae16bf5e3ba471381c9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 812b6651 7eb27056

security/keymint/aidl/vts/functional/AttestKeyTest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -98,17 +98,17 @@ void add_attestation_id(AuthorizationSetBuilder* attestation_id_tags, 
                        TypedTag<TagType::BYTES, tag> tag_type, const char* prop) {

    ::android::String8 prop_name =

            ::android::String8::format("ro.product.%s_for_attestation", prop);

    std::string prop_value = ::android::base::GetProperty(prop_name.string(), /* default= */ "");

    std::string prop_value = ::android::base::GetProperty(prop_name.c_str(), /* default= */ "");

    if (!prop_value.empty()) {

        add_tag_from_prop(attestation_id_tags, tag_type, prop_name.string());

        add_tag_from_prop(attestation_id_tags, tag_type, prop_name.c_str());

    } else {

        prop_name = ::android::String8::format("ro.product.vendor.%s", prop);

        prop_value = ::android::base::GetProperty(prop_name.string(), /* default= */ "");

        prop_value = ::android::base::GetProperty(prop_name.c_str(), /* default= */ "");

        if (!prop_value.empty()) {

            add_tag_from_prop(attestation_id_tags, tag_type, prop_name.string());

            add_tag_from_prop(attestation_id_tags, tag_type, prop_name.c_str());

        } else {

            prop_name = ::android::String8::format("ro.product.%s", prop);

            add_tag_from_prop(attestation_id_tags, tag_type, prop_name.string());

            add_tag_from_prop(attestation_id_tags, tag_type, prop_name.c_str());

        }

    }

}