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

Commit 9e133231 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12777764 from a9464874 to 25Q2-release

Change-Id: Iaf8c7c9c34567c5aab662dbc97fb09437b87457e
parents 56425fd6 a9464874
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ std::optional<DisplayIdentificationInfo> parseDisplayIdentificationData(
    return DisplayIdentificationInfo{
            .id = displayId,
            .name = std::string(edid->displayName),
            .port = port,
            .deviceProductInfo = buildDeviceProductInfo(*edid),
            .preferredDetailedTimingDescriptor = edid->preferredDetailedTimingDescriptor,
    };
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct DetailedTimingDescriptor {
struct DisplayIdentificationInfo {
    PhysicalDisplayId id;
    std::string name;
    uint8_t port;
    std::optional<DeviceProductInfo> deviceProductInfo;
    std::optional<DetailedTimingDescriptor> preferredDetailedTimingDescriptor;
};
+1 −2
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ cc_defaults {
    name: "libsurfaceflinger_defaults",
    defaults: [
        "android.hardware.graphics.composer3-ndk_shared",
        "android.hardware.power-ndk_shared",
        "librenderengine_deps",
        "libtimestats_deps",
        "libsurfaceflinger_common_deps",
        "surfaceflinger_defaults",
        "libsurfaceflinger_proto_deps",
        "poweradvisor_deps",
    ],
    cflags: [
        "-DLOG_TAG=\"SurfaceFlinger\"",
@@ -79,7 +79,6 @@ cc_defaults {
        "libhidlbase",
        "liblog",
        "libnativewindow",
        "libpowermanager",
        "libprocessgroup",
        "libprotobuf-cpp-lite",
        "libstatslog_surfaceflinger",
+1 −1
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ cc_defaults {
    defaults: [
        "aconfig_lib_cc_static_link.defaults",
        "android.hardware.graphics.composer3-ndk_shared",
        "android.hardware.power-ndk_shared",
        "librenderengine_deps",
        "libtimestats_deps",
        "surfaceflinger_defaults",
        "libsurfaceflinger_proto_deps",
        "poweradvisor_deps",
    ],
    cflags: [
        "-DLOG_TAG=\"CompositionEngine\"",
+4 −1
Original line number Diff line number Diff line
@@ -26,11 +26,12 @@

namespace android::display {

DisplaySnapshot::DisplaySnapshot(PhysicalDisplayId displayId,
DisplaySnapshot::DisplaySnapshot(PhysicalDisplayId displayId, uint8_t port,
                                 ui::DisplayConnectionType connectionType,
                                 DisplayModes&& displayModes, ui::ColorModes&& colorModes,
                                 std::optional<DeviceProductInfo>&& deviceProductInfo)
      : mDisplayId(displayId),
        mPort(port),
        mConnectionType(connectionType),
        mDisplayModes(std::move(displayModes)),
        mColorModes(std::move(colorModes)),
@@ -62,6 +63,8 @@ ui::ColorModes DisplaySnapshot::filterColorModes(bool supportsWideColor) const {
void DisplaySnapshot::dump(utils::Dumper& dumper) const {
    using namespace std::string_view_literals;

    dumper.dump("port"sv, mPort);

    dumper.dump("connectionType"sv, ftl::enum_string(mConnectionType));

    dumper.dump("colorModes"sv);
Loading