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

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

Snap for 6412615 from a0bb096d to rvc-release 

Change-Id: Id38bca0f5de5eff1145437de6bcb0019116359a3
parents f358e8a1 a0bb096d

libs/binder/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ filegroup { 


aidl_interface {

    name: "libbinder_aidl_test_stub",

    unstable: true,

    local_include_dir: "aidl",

    srcs: [":libbinder_aidl"],

    vendor_available: true,

libs/binder/ndk/test/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ cc_test { 


aidl_interface {

    name: "IBinderVendorDoubleLoadTest",

    unstable: true,

    vendor: true,

    srcs: [

        "IBinderVendorDoubleLoadTest.aidl",
@@ -100,6 +101,7 @@ aidl_interface { 


aidl_interface {

    name: "IBinderNdkUnitTest",

    unstable: true,

    srcs: [

        "IBinderNdkUnitTest.aidl",

        "IEmpty.aidl",

libs/binder/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ cc_test { 


aidl_interface {

    name: "binderStabilityTestIface",

    unstable: true,

    srcs: [

        "IBinderStabilityTest.aidl",

    ],

libs/binderthreadstate/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ hidl_package_root { 


aidl_interface {

    name: "binderthreadstateutilstest.aidl",

    unstable: true,

    srcs: ["IAidlStuff.aidl"],

}

libs/gui/BLASTBufferQueue.cpp

+4 −6
Original line number Diff line number Diff line
@@ -189,13 +189,13 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 
    mPendingReleaseItem.item = std::move(mSubmitted.front());

    mSubmitted.pop();



    processNextBufferLocked();

    processNextBufferLocked(false);



    mCallbackCV.notify_all();

    decStrong((void*)transactionCallbackThunk);

}



void BLASTBufferQueue::processNextBufferLocked() {

void BLASTBufferQueue::processNextBufferLocked(bool useNextTransaction) {

    ATRACE_CALL();

    if (mNumFrameAvailable == 0 || mNumAcquired == MAX_ACQUIRED_BUFFERS + 1) {

        return;
@@ -209,7 +209,7 @@ void BLASTBufferQueue::processNextBufferLocked() { 
    SurfaceComposerClient::Transaction localTransaction;

    bool applyTransaction = true;

    SurfaceComposerClient::Transaction* t = &localTransaction;

    if (mNextTransaction != nullptr && mUseNextTransaction) {

    if (mNextTransaction != nullptr && useNextTransaction) {

        t = mNextTransaction;

        mNextTransaction = nullptr;

        applyTransaction = false;
@@ -274,16 +274,14 @@ void BLASTBufferQueue::onFrameAvailable(const BufferItem& /*item*/) { 
        while (mNumFrameAvailable > 0 || mNumAcquired == MAX_ACQUIRED_BUFFERS + 1) {

            mCallbackCV.wait(_lock);

        }

        mUseNextTransaction = true;

    }

    // add to shadow queue

    mNumFrameAvailable++;

    processNextBufferLocked();

    processNextBufferLocked(true);

}



void BLASTBufferQueue::setNextTransaction(SurfaceComposerClient::Transaction* t) {

    std::lock_guard _lock{mMutex};

    mUseNextTransaction = false;

    mNextTransaction = t;

}