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

Commit 2cb09d0f authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q4 into AOSP main 

Bug: 370570306
Merged-In: I5ed05d0f5aa4c5e98fbd9b5275f3db39ccb76fed
Change-Id: I039103d5231a77496213df3ede1fa5b1dd259a8d
parents a3ff6f6b 52507b4b

Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -38,7 +38,13 @@ license { 


cc_library_headers {

    name: "native_headers",

    vendor_available: true,

    host_supported: true,

    target: {

        windows: {

            enabled: true,

        },

    },

    export_include_dirs: [

        "include/",

    ],

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               libs/nativewindow/

               libs/renderengine/

               libs/ui/

               libs/vibrator/

               libs/vr/

               opengl/libs/

               services/bufferhub/

cmds/dumpstate/dumpstate.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1559,6 +1559,13 @@ static void DumpstateLimitedOnly() { 
    RunDumpsys("DUMPSYS CONNECTIVITY REQUESTS", {"connectivity", "requests"},

               CommandOptions::WithTimeout(90).Build(), SEC_TO_MSEC(10));



    printf("========================================================\n");

    printf("== Networking Policy\n");

    printf("========================================================\n");



    RunDumpsys("DUMPSYS NETWORK POLICY", {"netpolicy"}, CommandOptions::WithTimeout(90).Build(),

               SEC_TO_MSEC(10));



    printf("========================================================\n");

    printf("== Dropbox crashes\n");

    printf("========================================================\n");

cmds/evemu-record/main.rs

+5 −3
Original line number Diff line number Diff line
@@ -50,8 +50,10 @@ enum TimestampBase { 
    /// The first event received from the device.

    FirstEvent,



    /// The time when the system booted.

    Boot,

    /// The Unix epoch (00:00:00 UTC on 1st January 1970), so that all timestamps are Unix

    /// timestamps. This makes the events in the recording easier to match up with those from other

    /// log sources.

    Epoch,

}



fn get_choice(max: u32) -> u32 {
@@ -188,7 +190,7 @@ fn print_events( 
        //

        // [0]: https://gitlab.freedesktop.org/libevdev/evemu/-/commit/eba96a4d2be7260b5843e65c4b99c8b06a1f4c9d

        TimestampBase::FirstEvent => event.time - TimeVal::new(0, 1),

        TimestampBase::Boot => TimeVal::new(0, 0),

        TimestampBase::Epoch => TimeVal::new(0, 0),

    };

    print_event(output, &event.offset_time_by(start_time))?;

    loop {

cmds/flatland/GLHelper.cpp

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>

#include <com_android_graphics_libgui_flags.h>

#include <gui/SurfaceComposerClient.h>

#include <ui/DisplayMode.h>
@@ -202,6 +203,14 @@ bool GLHelper::getShaderProgram(const char* name, GLuint* outPgm) { 


bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h,

        sp<GLConsumer>* glConsumer, EGLSurface* surface) {

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<GLConsumer> glc = new GLConsumer(name, GL_TEXTURE_EXTERNAL_OES, false, true);

    glc->setDefaultBufferSize(w, h);

    glc->getSurface()->setMaxDequeuedBufferCount(2);

    glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);



    sp<ANativeWindow> anw = glc->getSurface();

#else

    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);
@@ -212,6 +221,7 @@ bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h, 
    glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);



    sp<ANativeWindow> anw = new Surface(producer);

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), nullptr);

    if (s == EGL_NO_SURFACE) {

        fprintf(stderr, "eglCreateWindowSurface error: %#x\n", eglGetError());