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

Commit 7351c4c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update QueuedTransactionState std::vector arguments to comply with... 

Merge "Update QueuedTransactionState std::vector arguments to comply with go/sf-style-guide." into main
parents 1278a4c2 1929a2d9

libs/gui/TransactionState.cpp

+0 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ status_t TransactionState::readFromParcel(const Parcel* parcel) { 
    }



    return NO_ERROR;



    return NO_ERROR;

}



void TransactionState::merge(TransactionState&& other,

services/surfaceflinger/QueuedTransactionState.h

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ struct QueuedTransactionState { 
    QueuedTransactionState() = default;



    QueuedTransactionState(const FrameTimelineInfo& frameTimelineInfo,

                           std::vector<ResolvedComposerState>& composerStates,

                           std::vector<DisplayState>& displayStates, uint32_t transactionFlags,

                           std::vector<ResolvedComposerState> composerStates,

                           std::vector<DisplayState> displayStates, uint32_t transactionFlags,

                           const sp<IBinder>& applyToken,

                           const InputWindowCommands& inputWindowCommands,

                           int64_t desiredPresentTime, bool isAutoTimestamp,

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -5187,8 +5187,8 @@ status_t SurfaceFlinger::setTransactionState(TransactionState&& transactionState 


    QueuedTransactionState state{

            transactionState.mFrameTimelineInfo,

            resolvedStates,

            transactionState.mDisplayStates,

            std::move(resolvedStates),

            std::move(transactionState.mDisplayStates),

            flags,

            applyToken,

            std::move(inputWindowCommands),

services/surfaceflinger/tests/unittests/TransactionApplicationTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 */



#include "gui/TransactionState.h"

#undef LOG_TAG

#define LOG_TAG "TransactionApplicationTest"
@@ -26,6 +25,7 @@ 
#include <gtest/gtest.h>

#include <gui/LayerState.h>

#include <gui/SurfaceComposerClient.h>

#include <gui/TransactionState.h>

#include <gui/fake/BufferData.h>

#include <log/log.h>

#include <renderengine/mock/RenderEngine.h>