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

Commit 8203cb77 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9370741 from 0cbe4654 to udc-release 

Change-Id: Ifd38bf710b71bed87d5206b75df2d3b5f30b9a91
parents 7695b8ae 0cbe4654

include/ftl/optional.h

+8 −0
Original line number Diff line number Diff line
@@ -95,6 +95,14 @@ struct Optional final : std::optional<T> { 
    if (has_value()) return std::invoke(std::forward<F>(f), std::move(value()));

    return R();

  }



  // Delete new for this class. Its base doesn't have a virtual destructor, and

  // if it got deleted via base class pointer, it would cause undefined

  // behavior. There's not a good reason to allocate this object on the heap

  // anyway.

  static void* operator new(size_t) = delete;

  static void* operator new[](size_t) = delete;



};



template <typename T, typename U>

libs/gui/SurfaceComposerClient.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2330,6 +2330,9 @@ status_t SurfaceComposerClient::getDynamicDisplayInfo(const sp<IBinder>& display 
            outMode.sfVsyncOffset = mode.sfVsyncOffset;

            outMode.presentationDeadline = mode.presentationDeadline;

            outMode.group = mode.group;

            std::transform(mode.supportedHdrTypes.begin(), mode.supportedHdrTypes.end(),

                           std::back_inserter(outMode.supportedHdrTypes),

                           [](const int32_t& value) { return static_cast<ui::Hdr>(value); });

            outInfo->supportedDisplayModes.push_back(outMode);

        }

libs/gui/aidl/android/gui/DisplayMode.aidl

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ parcelable DisplayMode { 
    Size resolution;

    float xDpi = 0.0f;

    float yDpi = 0.0f;

    int[] supportedHdrTypes;



    float refreshRate = 0.0f;

    long appVsyncOffset = 0;

libs/ui/include/ui/DisplayMode.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <cstdint>

#include <type_traits>



#include <ui/GraphicTypes.h>

#include <ui/Size.h>

#include <utils/Flattenable.h>

#include <utils/Timers.h>
@@ -34,6 +35,7 @@ struct DisplayMode { 
    ui::Size resolution;

    float xDpi = 0;

    float yDpi = 0;

    std::vector<ui::Hdr> supportedHdrTypes;



    float refreshRate = 0;

    nsecs_t appVsyncOffset = 0;

libs/ui/include/ui/GraphicTypes.h

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <aidl/android/hardware/graphics/common/ChromaSiting.h>

#include <aidl/android/hardware/graphics/common/Compression.h>

#include <aidl/android/hardware/graphics/common/Cta861_3.h>

#include <aidl/android/hardware/graphics/common/Hdr.h>

#include <aidl/android/hardware/graphics/common/Interlaced.h>

#include <aidl/android/hardware/graphics/common/PlaneLayout.h>

#include <aidl/android/hardware/graphics/common/Smpte2086.h>
@@ -42,7 +43,6 @@ namespace ui { 
using android::hardware::graphics::common::V1_1::RenderIntent;

using android::hardware::graphics::common::V1_2::ColorMode;

using android::hardware::graphics::common::V1_2::Dataspace;

using android::hardware::graphics::common::V1_2::Hdr;

using android::hardware::graphics::common::V1_2::PixelFormat;



/**
@@ -50,6 +50,7 @@ using android::hardware::graphics::common::V1_2::PixelFormat; 
 */

using aidl::android::hardware::graphics::common::BlendMode;

using aidl::android::hardware::graphics::common::Cta861_3;

using aidl::android::hardware::graphics::common::Hdr;

using aidl::android::hardware::graphics::common::PlaneLayout;

using aidl::android::hardware::graphics::common::Smpte2086;