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

Commit 4a0958b1 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Replace string copies with const-ref am: 121fedaa am: e331953c am: dc5d0250 

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



Change-Id: I8d11e83246a4fe701434c20f5173fa1e4c725471
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d5f8ca9 dc5d0250

security/keymint/support/include/remote_prov/remote_prov_utils.h

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once



#include <memory>

#include <string>

#include <vector>

#include "aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.h"
@@ -129,8 +130,8 @@ struct JsonOutput { 
 *     "name": <string>

 *   }

 */

JsonOutput jsonEncodeCsrWithBuild(const std::string instance_name,

                                  const cppbor::Array& csr, const std::string serialno_prop);

JsonOutput jsonEncodeCsrWithBuild(const std::string& instance_name, const cppbor::Array& csr,

                                  const std::string& serialno_prop);



/**

 * Parses a DeviceInfo structure from the given CBOR data. The parsed data is then validated to

security/keymint/support/remote_prov_utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -337,8 +337,8 @@ ErrMsgOr<std::vector<BccEntryData>> validateBcc(const cppbor::Array* bcc, 
    return result;

}



JsonOutput jsonEncodeCsrWithBuild(const std::string instance_name, const cppbor::Array& csr,

                                  const std::string serialno_prop) {

JsonOutput jsonEncodeCsrWithBuild(const std::string& instance_name, const cppbor::Array& csr,

                                  const std::string& serialno_prop) {

    const std::string kFingerprintProp = "ro.build.fingerprint";



    if (!::android::base::WaitForPropertyCreation(kFingerprintProp)) {