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

Commit f8c8541d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6396429 from 9bb4cfb0 to rvc-release 

Change-Id: I54dc8ee2d60fe2e4e7047354c38a9574283813c7
parents 8caf2848 9bb4cfb0

libs/gui/BufferHubProducer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <inttypes.h>

#include <log/log.h>

#include <system/window.h>

#include <ui/BufferHubBuffer.h>



namespace android {

libs/gui/ISurfaceComposer.cpp

+2 −3
Original line number Diff line number Diff line
@@ -795,8 +795,7 @@ public: 
    }



    virtual status_t setDisplayContentSamplingEnabled(const sp<IBinder>& display, bool enable,

                                                      uint8_t componentMask,

                                                      uint64_t maxFrames) const {

                                                      uint8_t componentMask, uint64_t maxFrames) {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        data.writeStrongBinder(display);
@@ -1038,7 +1037,7 @@ public: 
        return NO_ERROR;

    }



    virtual status_t setDisplayBrightness(const sp<IBinder>& displayToken, float brightness) const {

    virtual status_t setDisplayBrightness(const sp<IBinder>& displayToken, float brightness) {

        Parcel data, reply;

        status_t error = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        if (error != NO_ERROR) {

libs/gui/include/gui/ISurfaceComposer.h

+2 −3
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ public: 
     */

    virtual status_t setDisplayContentSamplingEnabled(const sp<IBinder>& display, bool enable,

                                                      uint8_t componentMask,

                                                      uint64_t maxFrames) const = 0;

                                                      uint64_t maxFrames) = 0;



    /* Returns statistics on the color profile of the last frame displayed for a given display

     *
@@ -468,8 +468,7 @@ public: 
     *      BAD_VALUE         if the brightness is invalid, or

     *      INVALID_OPERATION if brightness operations are not supported.

     */

    virtual status_t setDisplayBrightness(const sp<IBinder>& displayToken,

                                          float brightness) const = 0;

    virtual status_t setDisplayBrightness(const sp<IBinder>& displayToken, float brightness) = 0;



    /*

     * Sends a power hint to the composer. This function is asynchronous.

libs/gui/tests/Surface_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ public: 
    }

    status_t setDisplayContentSamplingEnabled(const sp<IBinder>& /*display*/, bool /*enable*/,

                                              uint8_t /*componentMask*/,

                                              uint64_t /*maxFrames*/) const override {

                                              uint64_t /*maxFrames*/) override {

        return NO_ERROR;

    }

    status_t getDisplayedContentSample(const sp<IBinder>& /*display*/, uint64_t /*maxFrames*/,
@@ -822,7 +822,7 @@ public: 
        return NO_ERROR;

    }

    status_t setDisplayBrightness(const sp<IBinder>& /*displayToken*/,

                                  float /*brightness*/) const override {

                                  float /*brightness*/) override {

        return NO_ERROR;

    }

libs/ui/Android.bp

+0 −14
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ cc_library_shared { 


    srcs: [

        "ColorSpace.cpp",

        "BufferHubBuffer.cpp",

        "BufferHubEventFd.cpp",

        "BufferHubMetadata.cpp",

        "DebugUtils.cpp",

        "Fence.cpp",

        "FenceTime.cpp",
@@ -72,7 +69,6 @@ cc_library_shared { 
    //defaults: ["libui-validate-regions-defaults"],



    shared_libs: [

        "android.frameworks.bufferhub@1.0",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.allocator@4.0",
@@ -109,30 +105,20 @@ cc_library_shared { 
        vendor: {

            cflags: ["-DLIBUI_IN_VNDK"],

            exclude_srcs: [

                "BufferHubBuffer.cpp",

                "BufferHubEventFd.cpp",

                "BufferHubMetadata.cpp",

            ],

            exclude_header_libs: [

                "libbufferhub_headers",

                "libdvr_headers",

            ],

            exclude_shared_libs: [

                "android.frameworks.bufferhub@1.0",

                "libpdx_default_transport",

            ],

        },

    },



    header_libs: [

        "libbase_headers",

        "libbufferhub_headers",

        "libdvr_headers",

        "libnativebase_headers",

        "libnativewindow_headers",

        "libhardware_headers",

        "libui_headers",

        "libpdx_headers",

    ],



    export_static_lib_headers: [