Snap for 11967491 from 6312599b995865412436fb9033fbdf9efe99bd4f to 24Q3-release (50e5df02) · Commits · e / os / android_frameworks_native

cmds/cmd/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -27,14 +27,10 @@ cc_library_static {
		"libselinux",
		"libbinder",
		],
		whole_static_libs: [
		"libc++fs",
		],

		cflags: [
		"-Wall",
		"-Werror",
		"-DXP_UNIX",
		],
		}

		@@ -58,6 +54,5 @@ cc_binary {
		cflags: [
		"-Wall",
		"-Werror",
		"-DXP_UNIX",
		],
		}

cmds/installd/tests/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,6 @@ cc_defaults {
		"libziparchive",
		"liblog",
		"liblogwrap",
		"libc++fs",
		],
		product_variables: {
		arc: {

cmds/service/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ cc_binary {
		],

		cflags: [
		"-DXP_UNIX",
		"-Wall",
		"-Werror",
		],
		@@ -46,7 +45,6 @@ cc_binary {
		],

		cflags: [
		"-DXP_UNIX",
		"-DVENDORSERVICES",
		"-Wall",
		"-Werror",
		@@ -65,7 +63,6 @@ cc_binary_host {
		],

		cflags: [
		"-DXP_UNIX",
		"-Wall",
		"-Werror",
		],

libs/gui/BLASTBufferQueue.cpp

+12 −12

Original line number	Diff line number	Diff line
		@@ -613,8 +613,19 @@ status_t BLASTBufferQueue::acquireNextBufferLocked(
		std::bind(releaseBufferCallbackThunk, wp<BLASTBufferQueue>(this) /* callbackContext */,
		std::placeholders::_1, std::placeholders::_2, std::placeholders::_3);
		sp<Fence> fence = bufferItem.mFence ? new Fence(bufferItem.mFence->dup()) : Fence::NO_FENCE;

		nsecs_t dequeueTime = -1;
		{
		std::lock_guard _lock{mTimestampMutex};
		auto dequeueTimeIt = mDequeueTimestamps.find(buffer->getId());
		if (dequeueTimeIt != mDequeueTimestamps.end()) {
		dequeueTime = dequeueTimeIt->second;
		mDequeueTimestamps.erase(dequeueTimeIt);
		}
		}

		t->setBuffer(mSurfaceControl, buffer, fence, bufferItem.mFrameNumber, mProducerId,
		releaseBufferCallback);
		releaseBufferCallback, dequeueTime);
		t->setDataspace(mSurfaceControl, static_cast<ui::Dataspace>(bufferItem.mDataSpace));
		t->setHdrMetadata(mSurfaceControl, bufferItem.mHdrMetadata);
		t->setSurfaceDamageRegion(mSurfaceControl, bufferItem.mSurfaceDamage);
		@@ -658,17 +669,6 @@ status_t BLASTBufferQueue::acquireNextBufferLocked(
		mPendingFrameTimelines.pop();
		}

		{
		std::lock_guard _lock{mTimestampMutex};
		auto dequeueTime = mDequeueTimestamps.find(buffer->getId());
		if (dequeueTime != mDequeueTimestamps.end()) {
		Parcel p;
		p.writeInt64(dequeueTime->second);
		t->setMetadata(mSurfaceControl, gui::METADATA_DEQUEUE_TIME, p);
		mDequeueTimestamps.erase(dequeueTime);
		}
		}

		mergePendingTransactions(t, bufferItem.mFrameNumber);
		if (applyTransaction) {
		// All transactions on our apply token are one-way. See comment on mAppliedLastTransaction

libs/gui/LayerState.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -985,6 +985,7 @@ status_t BufferData::writeToParcel(Parcel* output) const {
		SAFE_PARCEL(output->writeBool, hasBarrier);
		SAFE_PARCEL(output->writeUint64, barrierFrameNumber);
		SAFE_PARCEL(output->writeUint32, producerId);
		SAFE_PARCEL(output->writeInt64, dequeueTime);

		return NO_ERROR;
		}
		@@ -1024,6 +1025,7 @@ status_t BufferData::readFromParcel(const Parcel* input) {
		SAFE_PARCEL(input->readBool, &hasBarrier);
		SAFE_PARCEL(input->readUint64, &barrierFrameNumber);
		SAFE_PARCEL(input->readUint32, &producerId);
		SAFE_PARCEL(input->readInt64, &dequeueTime);

		return NO_ERROR;
		}