Merge "Error fix from enabling Clang thread-safety checks in Cuttlefish" into main (f1512626) · Commits · e / os / android_frameworks_native

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -490,8 +490,10 @@ public:
		return mFlinger->SurfaceFlinger::getDisplayNativePrimaries(displayToken, primaries);
		}

		auto& getTransactionQueue() { return mFlinger->mTransactionHandler.mLocklessTransactionQueue; }
		auto& getPendingTransactionQueue() {
		auto& getTransactionQueue() NO_THREAD_SAFETY_ANALYSIS {
		return mFlinger->mTransactionHandler.mLocklessTransactionQueue;
		}
		auto& getPendingTransactionQueue() NO_THREAD_SAFETY_ANALYSIS {
		ftl::FakeGuard guard(kMainThreadContext);
		return mFlinger->mTransactionHandler.mPendingTransactionQueues;
		}
		@@ -701,7 +703,9 @@ public:
		}

		auto& mutableMinAcquiredBuffers() { return SurfaceFlinger::minAcquiredBuffers; }
		auto& mutableLayerSnapshotBuilder() { return mFlinger->mLayerSnapshotBuilder; };
		auto& mutableLayerSnapshotBuilder() NO_THREAD_SAFETY_ANALYSIS {
		return mFlinger->mLayerSnapshotBuilder;
		}

		auto fromHandle(const sp<IBinder>& handle) { return LayerHandle::getLayer(handle); }