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

Commit 8ac66cd2 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libgui: use read/writeStrongBinder" into stage-aosp-master am: 8c58b5af am: c253e3a3 

am: 4c23f400

Change-Id: I380e7dff8b0fb885cffa3d2e47af5b8d6802b7db
parents 01bb2a0b 4c23f400

libs/gui/ISurfaceComposer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public: 
        data.writeStrongBinder(applyToken);

        commands.write(data);

        data.writeInt64(desiredPresentTime);

        data.writeWeakBinder(uncacheBuffer.token);

        data.writeStrongBinder(uncacheBuffer.token.promote());

        data.writeUint64(uncacheBuffer.id);



        if (data.writeVectorSize(listenerCallbacks) == NO_ERROR) {
@@ -1036,7 +1036,7 @@ status_t BnSurfaceComposer::onTransact( 
            int64_t desiredPresentTime = data.readInt64();



            client_cache_t uncachedBuffer;

            uncachedBuffer.token = data.readWeakBinder();

            uncachedBuffer.token = data.readStrongBinder();

            uncachedBuffer.id = data.readUint64();



            std::vector<ListenerCallbacks> listenerCallbacks;

libs/gui/LayerState.cpp

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ status_t layer_state_t::write(Parcel& output) const 
           colorTransform.asArray(), 16 * sizeof(float));

    output.writeFloat(cornerRadius);

    output.writeBool(hasListenerCallbacks);

    output.writeWeakBinder(cachedBuffer.token);

    output.writeStrongBinder(cachedBuffer.token.promote());

    output.writeUint64(cachedBuffer.id);

    output.writeParcelable(metadata);
@@ -157,7 +157,7 @@ status_t layer_state_t::read(const Parcel& input) 
    colorTransform = mat4(static_cast<const float*>(input.readInplace(16 * sizeof(float))));

    cornerRadius = input.readFloat();

    hasListenerCallbacks = input.readBool();

    cachedBuffer.token = input.readWeakBinder();

    cachedBuffer.token = input.readStrongBinder();

    cachedBuffer.id = input.readUint64();

    input.readParcelable(&metadata);