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

Commit 4e5df18a authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Use binder rather than kernel ONEWAY flag." am: dc5eade0 am: edcecd9e 

am: cb4d5f44

Change-Id: I33a4b353466687cb34433f7a3bf54dabc01ffd6d
parents 7f58d4ba cb4d5f44

libs/gui/IGraphicBufferProducer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ public: 
        data.writeUint32(height);

        data.writeUint32(height);

        data.writeInt32(static_cast<int32_t>(format));

        data.writeInt32(static_cast<int32_t>(format));

        data.writeUint64(usage);

        data.writeUint64(usage);

        status_t result = remote()->transact(ALLOCATE_BUFFERS, data, &reply, TF_ONE_WAY);

        status_t result = remote()->transact(ALLOCATE_BUFFERS, data, &reply, IBinder::FLAG_ONEWAY);

        if (result != NO_ERROR) {

        if (result != NO_ERROR) {

            ALOGE("allocateBuffers failed to transact: %d", result);

            ALOGE("allocateBuffers failed to transact: %d", result);

        }

        }

libs/gui/ISurfaceComposer.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -551,8 +551,8 @@ public: 
            ALOGE("enableVSyncInjections failed to writeBool: %d", result);

            ALOGE("enableVSyncInjections failed to writeBool: %d", result);

            return result;

            return result;

        }

        }

        result = remote()->transact(BnSurfaceComposer::ENABLE_VSYNC_INJECTIONS,

        result = remote()->transact(BnSurfaceComposer::ENABLE_VSYNC_INJECTIONS, data, &reply,

                data, &reply, TF_ONE_WAY);

                                    IBinder::FLAG_ONEWAY);

        if (result != NO_ERROR) {

        if (result != NO_ERROR) {

            ALOGE("enableVSyncInjections failed to transact: %d", result);

            ALOGE("enableVSyncInjections failed to transact: %d", result);

            return result;

            return result;
@@ -572,7 +572,8 @@ public: 
            ALOGE("injectVSync failed to writeInt64: %d", result);

            ALOGE("injectVSync failed to writeInt64: %d", result);

            return result;

            return result;

        }

        }

        result = remote()->transact(BnSurfaceComposer::INJECT_VSYNC, data, &reply, TF_ONE_WAY);

        result = remote()->transact(BnSurfaceComposer::INJECT_VSYNC, data, &reply,

                                    IBinder::FLAG_ONEWAY);

        if (result != NO_ERROR) {

        if (result != NO_ERROR) {

            ALOGE("injectVSync failed to transact: %d", result);

            ALOGE("injectVSync failed to transact: %d", result);

            return result;

            return result;