Snap for 13624659 from 4a4799e1cfb0ef026202ad96e1d7b5039f4d12dd to 25Q4-release (ffcdcdbc) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -1909,11 +1909,6 @@ Dumpstate::RunStatus Dumpstate::dumpstate() {
		RunCommand("DUMP VENDOR RIL LOGS", {"vril-dump"}, options.Build());
		}

		/* Dump USB information */
		RunCommand("typec_connector_class", {"typec_connector_class"},
		CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());
		RunCommand("lsusb", {"lsusb"}, CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());

		printf("========================================================\n");
		printf("== Android Framework Services\n");
		printf("========================================================\n");

libs/binder/RpcTransportUtils.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,8 @@ status_t interruptableReadOrWrite(
		}

		// size to break up message - this is not reset for this read/write operation.
		constexpr size_t kChunkMax = 65536;
		const size_t kChunkMin = getpagesize(); // typical allocated granularity for sockets
		constexpr size_t kChunkMax = 4096;
		const size_t kChunkMin = 2048; // typical allocated granularity for sockets
		size_t chunkSize = kChunkMax;

		// b/419364025 - we have confirmed vhost-vsock ENOMEM for non-blocking sockets,

libs/binder/include/binder/RecordedTransaction.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		#include <binder/Common.h>
		#include <binder/Parcel.h>
		#include <binder/unique_fd.h>
		#include <mutex>

		#include <time.h>

		namespace android {

libs/gui/BufferItemConsumer.cpp

+23 −18

Original line number	Diff line number	Diff line
		@@ -54,33 +54,38 @@ sp<BufferItemConsumer> BufferItemConsumer::create(const sp<IGraphicBufferConsume

		BufferItemConsumer::BufferItemConsumer(uint64_t consumerUsage, int bufferCount,
		bool controlledByApp, bool isConsumerSurfaceFlinger)
		: ConsumerBase(controlledByApp, isConsumerSurfaceFlinger) {
		initialize(consumerUsage, bufferCount);
		}
		: ConsumerBase(controlledByApp, isConsumerSurfaceFlinger),
		mConsumerUsage(consumerUsage),
		mBufferCount(bufferCount) {}

		BufferItemConsumer::BufferItemConsumer(const sp<IGraphicBufferProducer>& producer,
		const sp<IGraphicBufferConsumer>& consumer,
		uint64_t consumerUsage, int bufferCount,
		bool controlledByApp)
		: ConsumerBase(producer, consumer, controlledByApp) {
		initialize(consumerUsage, bufferCount);
		}
		: ConsumerBase(producer, consumer, controlledByApp),
		mConsumerUsage(consumerUsage),
		mBufferCount(bufferCount) {}

		BufferItemConsumer::BufferItemConsumer(const sp<IGraphicBufferConsumer>& consumer,
		uint64_t consumerUsage, int bufferCount,
		bool controlledByApp)
		: ConsumerBase(consumer, controlledByApp),
		mConsumerUsage(consumerUsage),
		mBufferCount(bufferCount) {}

		BufferItemConsumer::BufferItemConsumer(
		const sp<IGraphicBufferConsumer>& consumer, uint64_t consumerUsage,
		int bufferCount, bool controlledByApp) :
		ConsumerBase(consumer, controlledByApp)
		{
		initialize(consumerUsage, bufferCount);
		void BufferItemConsumer::onFirstRef() {
		ConsumerBase::onFirstRef();
		initializeConsumer();
		}

		void BufferItemConsumer::initialize(uint64_t consumerUsage, int bufferCount) {
		status_t err = mConsumer->setConsumerUsageBits(consumerUsage);
		LOG_ALWAYS_FATAL_IF(err != OK, "Failed to set consumer usage bits to %#" PRIx64, consumerUsage);
		if (bufferCount != DEFAULT_MAX_BUFFERS) {
		err = mConsumer->setMaxAcquiredBufferCount(bufferCount);
		void BufferItemConsumer::initializeConsumer() {
		status_t err = mConsumer->setConsumerUsageBits(mConsumerUsage);
		LOG_ALWAYS_FATAL_IF(err != OK, "Failed to set consumer usage bits to %#" PRIx64,
		mConsumerUsage);
		if (mBufferCount != DEFAULT_MAX_BUFFERS) {
		err = mConsumer->setMaxAcquiredBufferCount(mBufferCount);
		LOG_ALWAYS_FATAL_IF(err != OK, "Failed to set max acquired buffer count to %d",
		bufferCount);
		mBufferCount);
		}
		}

libs/gui/GLConsumer.cpp

+8 −6

Original line number	Diff line number	Diff line
		@@ -182,10 +182,7 @@ GLConsumer::GLConsumer(const sp<IGraphicBufferConsumer>& bq, uint32_t tex, uint3
		mAttached(true) {
		GLC_LOGV("GLConsumer");

		memcpy(mCurrentTransformMatrix, mtxIdentity.asArray(),
		sizeof(mCurrentTransformMatrix));

		mConsumer->setConsumerUsageBits(DEFAULT_USAGE_FLAGS);
		memcpy(mCurrentTransformMatrix, mtxIdentity.asArray(), sizeof(mCurrentTransformMatrix));
		}

		GLConsumer::GLConsumer(uint32_t texTarget, bool useFenceSync, bool isControlledByApp)
		@@ -213,8 +210,6 @@ GLConsumer::GLConsumer(uint32_t texTarget, bool useFenceSync, bool isControlledB
		GLC_LOGV("GLConsumer");

		memcpy(mCurrentTransformMatrix, mtxIdentity.asArray(), sizeof(mCurrentTransformMatrix));

		mConsumer->setConsumerUsageBits(DEFAULT_USAGE_FLAGS);
		}

		GLConsumer::GLConsumer(const sp<IGraphicBufferConsumer>& bq, uint32_t texTarget, bool useFenceSync,
		@@ -244,10 +239,17 @@ GLConsumer::GLConsumer(const sp<IGraphicBufferConsumer>& bq, uint32_t texTarget,

		memcpy(mCurrentTransformMatrix, mtxIdentity.asArray(),
		sizeof(mCurrentTransformMatrix));
		}

		void GLConsumer::initializeConsumer() {
		mConsumer->setConsumerUsageBits(DEFAULT_USAGE_FLAGS);
		}

		void GLConsumer::onFirstRef() {
		ConsumerBase::onFirstRef();
		initializeConsumer();
		}

		status_t GLConsumer::setDefaultBufferSize(uint32_t w, uint32_t h)
		{
		Mutex::Autolock lock(mMutex);