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

Commit 944e640e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I8a7ff4b0,Id121ecd4,I23375d73 

* changes:
  [hardware][interfaces][sensors] fix -Wreorder-init-list
  [hardware][interfaces][sensors] fix -Wreorder-init-list again
  [hardware][interfaces][graphics] fix -Wimplicit-int-float-conversion
parents 2932b225 8cb3c9b3

graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1389,7 +1389,7 @@ static std::string rectString(hwc_rect_t rect) { 
}



static std::string approximateFloatString(float f) {

    if (static_cast<int32_t>(f) == f) {

    if (static_cast<float>(static_cast<int32_t>(f)) == f) {

        return std::to_string(static_cast<int32_t>(f));

    }

    int32_t truncated = static_cast<int32_t>(f * 10);
@@ -1680,10 +1680,10 @@ std::string HWC2On1Adapter::Display::Config::toString(bool splitLine) const { 
    if (mAttributes.count(HWC2::Attribute::DpiX) != 0 &&

            mAttributes.at(HWC2::Attribute::DpiX) != -1) {

        std::memset(buffer, 0, BUFFER_SIZE);

        writtenBytes = snprintf(buffer, BUFFER_SIZE,

                ", DPI: %.1f x %.1f",

                mAttributes.at(HWC2::Attribute::DpiX) / 1000.0f,

                mAttributes.at(HWC2::Attribute::DpiY) / 1000.0f);

        writtenBytes =

                snprintf(buffer, BUFFER_SIZE, ", DPI: %.1f x %.1f",

                         static_cast<float>(mAttributes.at(HWC2::Attribute::DpiX)) / 1000.0f,

                         static_cast<float>(mAttributes.at(HWC2::Attribute::DpiY)) / 1000.0f);

        output.append(buffer, writtenBytes);

    }

sensors/1.0/default/convert.cpp

+3 −3
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ void convertFromSensorEvent(const sensors_event_t &src, Event *dst) { 
    typedef ::android::hardware::sensors::V1_0::MetaDataEventType MetaDataEventType;



    *dst = {

            .timestamp = src.timestamp,

            .sensorHandle = src.sensor,

            .sensorType = (SensorType)src.type,

        .timestamp = src.timestamp

    };



    switch (dst->sensorType) {

sensors/common/vts/utils/GrallocWrapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ BufferDescriptor GrallocHalWrapper<AllocatorT, MapperT>::getDescriptor(uint32_t 
            .width = size,

            .height = 1,

            .layerCount = 1,

            .usage = kBufferUsage,

            .format = static_cast<decltype(descriptorInfo.format)>(PixelFormat::BLOB),

            .usage = kBufferUsage,

    };



    BufferDescriptor descriptor;