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

Commit 318ac527 authored by Yi Kong's avatar Yi Kong Committed by Android (Google) Code Review
Browse files

Merge "Fix ctad-maybe-unsupported warning"

parents 05279df2 d2639aa7
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ void TransactionCompletedListener::addSurfaceControlToCallbacks(
}

void TransactionCompletedListener::onTransactionCompleted(ListenerStats listenerStats) {
    std::lock_guard lock(mMutex);
    std::lock_guard<std::mutex> lock(mMutex);

    /* This listener knows all the sp<IBinder> to sp<SurfaceControl> for all its registered
     * callbackIds, except for when Transactions are merged together. This probably cannot be
@@ -242,7 +242,7 @@ public:
    }

    int32_t getId(const sp<GraphicBuffer>& buffer) {
        std::lock_guard lock(mMutex);
        std::lock_guard<std::mutex> lock(mMutex);

        auto itr = mBuffers.find(buffer);
        if (itr == mBuffers.end()) {
@@ -253,7 +253,7 @@ public:
    }

    int32_t cache(const sp<GraphicBuffer>& buffer) {
        std::lock_guard lock(mMutex);
        std::lock_guard<std::mutex> lock(mMutex);

        int32_t bufferId = getNextAvailableId();