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

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

Snap for 6436225 from c50b6044 to rvc-release 

Change-Id: I08b3683cba78213b3c899ca3030438ae2458a8d1
parents 05f343a5 c50b6044

cmds/atrace/atrace.cpp

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static const TracingCategory k_categories[] = { 
        { OPT,      "events/kmem/rss_stat/enable" },

        { OPT,      "events/kmem/ion_heap_grow/enable" },

        { OPT,      "events/kmem/ion_heap_shrink/enable" },

        { OPT,      "events/ion/ion_stat/enable" },

    } },

};

cmds/atrace/atrace.rc

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_grow/enable

    chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_heap_shrink/enable

    chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_shrink/enable

    chmod 0666 /sys/kernel/debug/tracing/events/ion/ion_stat/enable

    chmod 0666 /sys/kernel/tracing/events/ion/ion_stat/enable

    chmod 0666 /sys/kernel/debug/tracing/events/mm_event/mm_event_record/enable

    chmod 0666 /sys/kernel/tracing/events/mm_event/mm_event_record/enable

    chmod 0666 /sys/kernel/debug/tracing/events/signal/signal_generate/enable

libs/gui/BLASTBufferQueue.cpp

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ void BLASTBufferItemConsumer::getConnectionEvents(uint64_t frameNumber, bool* ne 
    if (needsDisconnect != nullptr) *needsDisconnect = disconnect;

}



BLASTBufferQueue::BLASTBufferQueue(const sp<SurfaceControl>& surface, int width, int height)

BLASTBufferQueue::BLASTBufferQueue(const sp<SurfaceControl>& surface, int width, int height,

                                   bool enableTripleBuffering)

      : mSurfaceControl(surface),

        mWidth(width),

        mHeight(height),
@@ -105,8 +106,7 @@ BLASTBufferQueue::BLASTBufferQueue(const sp<SurfaceControl>& surface, int width, 
    // explicitly so that dequeueBuffer will block

    mProducer->setDequeueTimeout(std::numeric_limits<int64_t>::max());



    int8_t disableTripleBuffer = property_get_bool("ro.sf.disable_triple_buffer", 0);

    if (!disableTripleBuffer) {

    if (enableTripleBuffering) {

        mProducer->setMaxDequeuedBufferCount(2);

    }

    mBufferItemConsumer =

libs/gui/include/gui/BLASTBufferQueue.h

+3 −1
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ class BLASTBufferQueue 
    : public ConsumerBase::FrameAvailableListener, public BufferItemConsumer::BufferFreedListener

{

public:

    BLASTBufferQueue(const sp<SurfaceControl>& surface, int width, int height);

    BLASTBufferQueue(const sp<SurfaceControl>& surface, int width, int height,

                     bool enableTripleBuffering = true);



    sp<IGraphicBufferProducer> getIGraphicBufferProducer() const {

        return mProducer;

    }

libs/vr/libvrflinger/tests/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ shared_libs = [ 
    "libutils",

    "libnativewindow",

    "libpdx_default_transport",

    "libSurfaceFlingerProp",

]



static_libs = [
@@ -32,5 +33,6 @@ cc_test { 
        "-Wall",

        "-Werror",

    ],

    header_libs: ["libsurfaceflinger_headers"],

    name: "vrflinger_test",

}