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

Commit a00c0b82 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: bfff8ee0 

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



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

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

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




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

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





    const string& GenerateMessage(int size) {

    const string GenerateMessage(int size) {

        for (const string& message : message_cache_) {

        for (const string& message : message_cache_) {

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

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

                return message;

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

        }

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

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

        message_cache_.push_back(message);

        message_cache_.push_back(message);

        return std::move(message);

        return message;

    }

    }





    optional<BlockMode> getBlockMode(string transform) {

    optional<BlockMode> getBlockMode(string transform) {