Snap for 6279178 from 966d74c49dcf2b641950ca99691509d90f8276cd to rvc-release (52122b7b) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -1477,6 +1477,8 @@ static Dumpstate::RunStatus dumpstate() {
		ds.AddDir(WMTRACE_DATA_DIR, false);
		}

		ds.AddDir(SNAPSHOTCTL_LOG_DIR, false);

		RUN_SLOW_FUNCTION_WITH_CONSENT_CHECK(ds.DumpstateBoard);

		/* Migrate the ril_dumpstate to a device specific dumpstate? */
		@@ -1605,7 +1607,6 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() {
		ds.AddDir(RECOVERY_DATA_DIR, true);
		ds.AddDir(UPDATE_ENGINE_LOG_DIR, true);
		ds.AddDir(LOGPERSIST_DATA_DIR, false);
		ds.AddDir(SNAPSHOTCTL_LOG_DIR, false);
		if (!PropertiesHelper::IsUserBuild()) {
		ds.AddDir(PROFILE_DATA_DIR_CUR, true);
		ds.AddDir(PROFILE_DATA_DIR_REF, true);

libs/binder/ndk/ibinder.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -486,7 +486,6 @@ pid_t AIBinder_getCallingPid() {

		void AIBinder_incStrong(AIBinder* binder) {
		if (binder == nullptr) {
		LOG(ERROR) << __func__ << ": on null binder";
		return;
		}

services/surfaceflinger/BufferQueueLayer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -441,7 +441,7 @@ void BufferQueueLayer::onFrameAvailable(const BufferItem& item) {
		mQueueItemCondition.broadcast();
		}

		mFlinger->mInterceptor->saveBufferUpdate(this, item.mGraphicBuffer->getWidth(),
		mFlinger->mInterceptor->saveBufferUpdate(layerId, item.mGraphicBuffer->getWidth(),
		item.mGraphicBuffer->getHeight(), item.mFrameNumber);

		mFlinger->signalLayerUpdate();

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -2808,7 +2808,7 @@ void SurfaceFlinger::updateInputWindowInfo() {
		}

		void SurfaceFlinger::commitInputWindowCommands() {
		mInputWindowCommands = mPendingInputWindowCommands;
		mInputWindowCommands.merge(mPendingInputWindowCommands);
		mPendingInputWindowCommands.clear();
		}

		@@ -5779,6 +5779,7 @@ void SurfaceFlinger::setInputWindowsFinished() {
		Mutex::Autolock _l(mStateLock);

		mPendingSyncInputWindows = false;

		mTransactionCV.broadcast();
		}

services/surfaceflinger/SurfaceInterceptor.cpp

+12 −5

Original line number	Diff line number	Diff line
		@@ -524,11 +524,11 @@ void SurfaceInterceptor::addSurfaceDeletionLocked(Increment* increment,
		deletion->set_id(getLayerId(layer));
		}

		void SurfaceInterceptor::addBufferUpdateLocked(Increment* increment, const sp<const Layer>& layer,
		void SurfaceInterceptor::addBufferUpdateLocked(Increment* increment, int32_t layerId,
		uint32_t width, uint32_t height, uint64_t frameNumber)
		{
		BufferUpdate* update(increment->mutable_buffer_update());
		update->set_id(getLayerId(layer));
		update->set_id(layerId);
		update->set_w(width);
		update->set_h(height);
		update->set_frame_number(frameNumber);
		@@ -644,15 +644,22 @@ void SurfaceInterceptor::saveSurfaceDeletion(const sp<const Layer>& layer) {
		addSurfaceDeletionLocked(createTraceIncrementLocked(), layer);
		}

		void SurfaceInterceptor::saveBufferUpdate(const sp<const Layer>& layer, uint32_t width,
		/**
		* Here we pass the layer by ID instead of by sp<> since this is called without
		* holding the state-lock from a Binder thread. If we required the caller
		* to pass 'this' by sp<> the temporary sp<> constructed could end up
		* being the last reference and we might accidentally destroy the Layer
		* from this binder thread.
		*/
		void SurfaceInterceptor::saveBufferUpdate(int32_t layerId, uint32_t width,
		uint32_t height, uint64_t frameNumber)
		{
		if (!mEnabled \|\| layer == nullptr) {
		if (!mEnabled) {
		return;
		}
		ATRACE_CALL();
		std::lock_guard<std::mutex> protoGuard(mTraceMutex);
		addBufferUpdateLocked(createTraceIncrementLocked(), layer, width, height, frameNumber);
		addBufferUpdateLocked(createTraceIncrementLocked(), layerId, width, height, frameNumber);
		}

		void SurfaceInterceptor::saveVSyncEvent(nsecs_t timestamp) {