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

Commit 4efab5d7 authored by Patrick Williams's avatar Patrick Williams Committed by Android (Google) Code Review
Browse files

Merge "Fix transactionCallbackThunk lifetime issue" into main

parents 381aea59 1a37b731
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -356,8 +356,9 @@ static void transactionCallbackThunk(void* context, nsecs_t latchTime,
    if (context == nullptr) {
        return;
    }
    sp<BLASTBufferQueue> bq = static_cast<BLASTBufferQueue*>(context);
    auto bq = static_cast<BLASTBufferQueue*>(context);
    bq->transactionCallback(latchTime, presentFence, stats);
    bq->decStrong((void*)transactionCallbackThunk);
}

void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence>& /*presentFence*/,
@@ -413,8 +414,6 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence
            BQA_LOGE("No matching SurfaceControls found: mSurfaceControlsWithPendingCallback was "
                     "empty.");
        }

        decStrong((void*)transactionCallbackThunk);
    }
}