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

Commit 93555841 authored by Jim Shargo's avatar Jim Shargo Committed by Android (Google) Code Review
Browse files

Merge changes I37ee51b1,I86ea29a8,I2a43d22d,I832d274b into main 

* changes:
  libgui: Add a test server utility for unit tests.
  view::Surface: Add toString()
  libui/libui: Remove extraneous semicolons
  libgui: Expose methods to Surface API to support Camera3StreamSplitter
parents cb0f460a 550dbaa5

libs/gui/include/gui/FrameTimestamps.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public: 
    // Public for testing.

    static nsecs_t snapToNextTick(

            nsecs_t timestamp, nsecs_t tickPhase, nsecs_t tickInterval);

    nsecs_t getReportedCompositeDeadline() const { return mCompositorTiming.deadline; };

    nsecs_t getReportedCompositeDeadline() const { return mCompositorTiming.deadline; }



    nsecs_t getNextCompositeDeadline(const nsecs_t now) const;

    nsecs_t getCompositeInterval() const { return mCompositorTiming.interval; }

libs/gui/include/gui/IGraphicBufferProducer.h

+1 −1
Original line number Diff line number Diff line
@@ -867,6 +867,6 @@ class BnGraphicBufferProducer : public IGraphicBufferProducer { 
#endif



// ----------------------------------------------------------------------------

}; // namespace android

} // namespace android



#endif // ANDROID_GUI_IGRAPHICBUFFERPRODUCER_H

libs/gui/include/gui/Surface.h

+8 −7
Original line number Diff line number Diff line
@@ -194,6 +194,14 @@ public: 
     * in <system/window.h>. */

    int setScalingMode(int mode);



    virtual int setBuffersTimestamp(int64_t timestamp);

    virtual int setBuffersDataSpace(ui::Dataspace dataSpace);

    virtual int setCrop(Rect const* rect);

    virtual int setBuffersTransform(uint32_t transform);

    virtual int setBuffersStickyTransform(uint32_t transform);

    virtual int setBuffersFormat(PixelFormat format);

    virtual int setUsage(uint64_t reqUsage);



    // See IGraphicBufferProducer::setDequeueTimeout

    status_t setDequeueTimeout(nsecs_t timeout);
@@ -354,16 +362,9 @@ protected: 
    virtual int connect(int api);

    virtual int setBufferCount(int bufferCount);

    virtual int setBuffersUserDimensions(uint32_t width, uint32_t height);

    virtual int setBuffersFormat(PixelFormat format);

    virtual int setBuffersTransform(uint32_t transform);

    virtual int setBuffersStickyTransform(uint32_t transform);

    virtual int setBuffersTimestamp(int64_t timestamp);

    virtual int setBuffersDataSpace(ui::Dataspace dataSpace);

    virtual int setBuffersSmpte2086Metadata(const android_smpte2086_metadata* metadata);

    virtual int setBuffersCta8613Metadata(const android_cta861_3_metadata* metadata);

    virtual int setBuffersHdr10PlusMetadata(const size_t size, const uint8_t* metadata);

    virtual int setCrop(Rect const* rect);

    virtual int setUsage(uint64_t reqUsage);

    virtual void setSurfaceDamage(android_native_rect_t* rects, size_t numRects);



public:

libs/gui/include/gui/view/Surface.h

+2 −1
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ class Surface : public Parcelable { 
    // of the full parceling to happen on its native side.

    status_t readFromParcel(const Parcel* parcel, bool nameAlreadyRead);



  private:

    std::string toString() const;



private:

    static String16 readMaybeEmptyString16(const Parcel* parcel);

};

libs/gui/tests/Android.bp

+45 −6
Original line number Diff line number Diff line
@@ -12,6 +12,34 @@ package { 
    default_applicable_licenses: ["frameworks_native_license"],

}



aidl_interface {

    name: "libgui_test_server_aidl",

    unstable: true,

    srcs: ["testserver/aidl/**/*.aidl"],

    local_include_dir: "testserver/aidl",

    include_dirs: [

        "frameworks/native/aidl/gui",

    ],

    backend: {

        cpp: {

            enabled: true,

            additional_shared_libraries: [

                "libgui",

                "libui",

            ],

        },

        java: {

            enabled: false,

        },

        ndk: {

            enabled: false,

        },

        rust: {

            enabled: false,

        },

    },

}



cc_test {

    name: "libgui_test",

    test_suites: ["device-tests"],
@@ -30,7 +58,6 @@ cc_test { 
    ],



    srcs: [

        "LibGuiMain.cpp", // Custom gtest entrypoint

        "BLASTBufferQueue_test.cpp",

        "BufferItemConsumer_test.cpp",

        "BufferQueue_test.cpp",
@@ -38,24 +65,29 @@ cc_test { 
        "Choreographer_test.cpp",

        "CompositorTiming_test.cpp",

        "CpuConsumer_test.cpp",

        "EndToEndNativeInputTest.cpp",

        "FrameRateUtilsTest.cpp",

        "DisplayInfo_test.cpp",

        "DisplayedContentSampling_test.cpp",

        "DisplayInfo_test.cpp",

        "EndToEndNativeInputTest.cpp",

        "FillBuffer.cpp",

        "FrameRateUtilsTest.cpp",

        "GLTest.cpp",

        "IGraphicBufferProducer_test.cpp",

        "LibGuiMain.cpp", // Custom gtest entrypoint

        "Malicious.cpp",

        "MultiTextureConsumer_test.cpp",

        "RegionSampling_test.cpp",

        "StreamSplitter_test.cpp",

        "Surface_test.cpp",

        "SurfaceTextureClient_test.cpp",

        "SurfaceTextureFBO_test.cpp",

        "SurfaceTextureGL_test.cpp",

        "SurfaceTextureGLThreadToGL_test.cpp",

        "SurfaceTextureGLToGL_test.cpp",

        "SurfaceTextureGL_test.cpp",

        "SurfaceTextureMultiContextGL_test.cpp",

        "Surface_test.cpp",

        "TestServer_test.cpp",

        "testserver/TestServer.cpp",

        "testserver/TestServerClient.cpp",

        "testserver/TestServerHost.cpp",

        "TextureRenderer.cpp",

        "VsyncEventData_test.cpp",

        "WindowInfo_test.cpp",
@@ -66,10 +98,17 @@ cc_test { 
        "android.hardware.configstore-utils",

        "libSurfaceFlingerProp",

        "libGLESv1_CM",

        "libgui_test_server_aidl-cpp",

        "libinput",

        "libnativedisplay",

    ],



    // This needs to get copied over for the test since it's not part of the

    // platform.

    data_libs: [

        "libgui_test_server_aidl-cpp",

    ],



    static_libs: [

        "libgmock",

    ],