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

Commit 1214c989 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update CommandWriter to CommandWriterBase"

parents 7ea1f9e0 3c9cbd48

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+3 −3
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ Error CommandReader::parse() 


bool CommandReader::parseSelectDisplay(uint16_t length)

{

    if (length != CommandWriter::kSelectDisplayLength) {

    if (length != CommandWriterBase::kSelectDisplayLength) {

        return false;

    }
@@ -734,7 +734,7 @@ bool CommandReader::parseSelectDisplay(uint16_t length) 


bool CommandReader::parseSetError(uint16_t length)

{

    if (length != CommandWriter::kSetErrorLength) {

    if (length != CommandWriterBase::kSetErrorLength) {

        return false;

    }
@@ -796,7 +796,7 @@ bool CommandReader::parseSetDisplayRequests(uint16_t length) 


bool CommandReader::parseSetPresentFence(uint16_t length)

{

    if (length != CommandWriter::kSetPresentFenceLength ||

    if (length != CommandWriterBase::kSetPresentFenceLength ||

            !mCurrentReturnData) {

        return false;

    }

services/surfaceflinger/DisplayHardware/ComposerHal.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ using android::hardware::graphics::composer::V2_1::Display; 
using android::hardware::graphics::composer::V2_1::Layer;

using android::hardware::graphics::composer::V2_1::Config;



using android::hardware::graphics::composer::V2_1::CommandWriter;

using android::hardware::graphics::composer::V2_1::CommandWriterBase;

using android::hardware::graphics::composer::V2_1::CommandReaderBase;



using android::hardware::kSynchronizedReadWrite;
@@ -228,7 +228,7 @@ private: 
    // 64KiB minus a small space for metadata such as read/write pointers

    static constexpr size_t kWriterInitialSize =

        64 * 1024 / sizeof(uint32_t) - 16;

    CommandWriter mWriter;

    CommandWriterBase mWriter;

    CommandReader mReader;

};