Snap for 9773131 from 92a3d2c33a1a87dce16f0c0f1044aa3ead9267a0 to udc-release (d5ca09ff) · Commits · e / os / platform_frameworks_native

PREUPLOAD.cfg

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ clang_format = true
		rustfmt = --config-path=rustfmt.toml
		# Only turn on clang-format check for the following subfolders.
		clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		cmds/dumpstate/
		cmds/idlcli/
		cmds/installd/
		cmds/servicemanager/

+3 −3

Original line number	Diff line number	Diff line
		@@ -56,12 +56,12 @@ __attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServic
		*
		* \param binder object to register globally with the service manager.
		* \param instance identifier of the service. This will be used to lookup the service.
		* \param flag an AServiceManager_AddServiceFlag enum to denote how the service should be added.
		* \param flags an AServiceManager_AddServiceFlag enum to denote how the service should be added.
		*
		* \return EX_NONE on success.
		*/
		__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServiceWithFlag(
		AIBinder* binder, const char* instance, const AServiceManager_AddServiceFlag flag)
		__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServiceWithFlags(
		AIBinder* binder, const char* instance, const AServiceManager_AddServiceFlag flags)
		__INTRODUCED_IN(34);

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ LIBBINDER_NDK34 { # introduced=UpsideDownCake
		AServiceManager_getUpdatableApexName; # systemapi
		AServiceManager_registerForServiceNotifications; # systemapi llndk
		AServiceManager_NotificationRegistration_delete; # systemapi llndk
		AServiceManager_addServiceWithFlag; # systemapi llndk
		AServiceManager_addServiceWithFlags; # systemapi llndk
		};

		LIBBINDER_NDK_PLATFORM {

+3 −3

Original line number	Diff line number	Diff line
		@@ -42,15 +42,15 @@ binder_exception_t AServiceManager_addService(AIBinder* binder, const char* inst
		return PruneException(exception);
		}

		binder_exception_t AServiceManager_addServiceWithFlag(AIBinder* binder, const char* instance,
		const AServiceManager_AddServiceFlag flag) {
		binder_exception_t AServiceManager_addServiceWithFlags(AIBinder* binder, const char* instance,
		const AServiceManager_AddServiceFlag flags) {
		if (binder == nullptr \|\| instance == nullptr) {
		return EX_ILLEGAL_ARGUMENT;
		}

		sp<IServiceManager> sm = defaultServiceManager();

		bool allowIsolated = flag & AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED;
		bool allowIsolated = flags & AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED;
		status_t exception = sm->addService(String16(instance), binder->getBinder(), allowIsolated);
		return PruneException(exception);
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -335,6 +335,7 @@ sp<IBinder> Layer::getHandle() {
		return nullptr;
		}
		mGetHandleCalled = true;
		mHandleAlive = true;
		return sp<LayerHandle>::make(mFlinger, sp<Layer>::fromExisting(this));
		}

		@@ -1649,9 +1650,9 @@ void Layer::onDisconnect() {
		mFlinger->mFrameTracer->onDestroy(layerId);
		}

		size_t Layer::getChildrenCount() const {
		size_t Layer::getDescendantCount() const {
		size_t count = 0;
		for (const sp<Layer>& child : mCurrentChildren) {
		for (const sp<Layer>& child : mDrawingChildren) {
		count += 1 + child->getChildrenCount();
		}
		return count;
		@@ -1898,6 +1899,12 @@ void Layer::traverse(LayerVector::StateSet state, const LayerVector::Visitor& vi
		}
		}

		void Layer::traverseChildren(const LayerVector::Visitor& visitor) {
		for (const sp<Layer>& child : mDrawingChildren) {
		visitor(child.get());
		}
		}

		LayerVector Layer::makeChildrenTraversalList(LayerVector::StateSet stateSet,
		const std::vector<Layer*>& layersInTree) {
		LOG_ALWAYS_FATAL_IF(stateSet == LayerVector::StateSet::Invalid,