Snap for 7233012 from 796cdab0267173c873f508a6cefeddf8d2ff7d14 to sc-release (1f6f1557) · Commits · e / os / android_frameworks_native

include/android/multinetwork.h

+22 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,28 @@ int android_setprocnetwork(net_handle_t network) __INTRODUCED_IN(23);
		*/
		int android_getprocnetwork(net_handle_t *network) __INTRODUCED_IN(31);

		/**
		* Binds domain name resolutions performed by this process to \|network\|.
		* android_setprocnetwork takes precedence over this setting.
		*
		* To clear a previous process binding, invoke with NETWORK_UNSPECIFIED.
		* On success 0 is returned. On error -1 is returned, and errno is set.
		*
		* Available since API level 31.
		*/
		int android_setprocdns(net_handle_t network) __INTRODUCED_IN(31);

		/**
		* Gets the \|network\| to which domain name resolutions are bound on the
		* current process.
		*
		* Returns 0 on success, or -1 setting errno to EINVAL if a null pointer is
		* passed in.
		*
		* Available since API level 31.
		*/
		int android_getprocdns(net_handle_t *network) __INTRODUCED_IN(31);


		/**
		* Perform hostname resolution via the DNS servers associated with \|network\|.

include/android/surface_control.h

+32 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,38 @@ void ASurfaceTransaction_setGeometry(ASurfaceTransaction* transaction,
		const ARect& destination, int32_t transform)
		__INTRODUCED_IN(29);

		/**
		* \param source The sub-rect within the buffer's content to be rendered inside the surface's area
		* The surface's source rect is clipped by the bounds of its current buffer. The source rect's width
		* and height must be > 0.
		*
		* Available since API level 31.
		*/
		void ASurfaceTransaction_setSourceRect(ASurfaceTransaction* transaction,
		ASurfaceControl* surface_control, const ARect& source)
		__INTRODUCED_IN(31);

		/**
		* \param destination Specifies the rect in the parent's space where this surface will be drawn. The
		* post source rect bounds are scaled to fit the destination rect. The surface's destination rect is
		* clipped by the bounds of its parent. The destination rect's width and height must be > 0.
		*
		* Available since API level 31.
		*/
		void ASurfaceTransaction_setPosition(ASurfaceTransaction* transaction,
		ASurfaceControl* surface_control, const ARect& destination)
		__INTRODUCED_IN(31);

		/**
		* \param transform The transform applied after the source rect is applied to the buffer. This
		* parameter should be set to 0 for no transform. To specify a transfrom use the
		* NATIVE_WINDOW_TRANSFORM_* enum.
		*
		* Available since API level 31.
		*/
		void ASurfaceTransaction_setTransform(ASurfaceTransaction* transaction,
		ASurfaceControl* surface_control, int32_t transform)
		__INTRODUCED_IN(31);

		/**
		* Parameter for ASurfaceTransaction_setBufferTransparency().

libs/nativewindow/AHardwareBuffer.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,13 +51,13 @@ int AHardwareBuffer_allocate(const AHardwareBuffer_Desc* desc, AHardwareBuffer**
		std::string("AHardwareBuffer pid [") + std::to_string(getpid()) + "]"));

		status_t err = gbuffer->initCheck();
		if (err != 0 \|\| gbuffer->handle == 0) {
		if (err != 0 \|\| gbuffer->handle == nullptr) {
		if (err == NO_MEMORY) {
		GraphicBuffer::dumpAllocationsToSystemLog();
		}
		ALOGE("GraphicBuffer(w=%u, h=%u, lc=%u) failed (%s), handle=%p",
		desc->width, desc->height, desc->layers, strerror(-err), gbuffer->handle);
		return err;
		return err == 0 ? UNKNOWN_ERROR : err;
		}

		*outBuffer = AHardwareBuffer_from_GraphicBuffer(gbuffer.get());