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

Commit 93a75692 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Fix return-stack-address warning" am: 550964e8 am: d6b935c1 am:... 

Merge "Fix return-stack-address warning" am: 550964e8 am: d6b935c1 am: bfff8ee0 am: a00c0b82 am: b1e27610

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



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

security/keymint/aidl/vts/performance/KeyMintBenchmark.cpp

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ class KeyMintBenchmarkTest { 


    int getError() { return static_cast<int>(error_); }



    const string& GenerateMessage(int size) {

    const string GenerateMessage(int size) {

        for (const string& message : message_cache_) {

            if (message.size() == size) {

                return message;
@@ -76,7 +76,7 @@ class KeyMintBenchmarkTest { 
        }

        string message = string(size, 'x');

        message_cache_.push_back(message);

        return std::move(message);

        return message;

    }



    optional<BlockMode> getBlockMode(string transform) {