Snap for 5007879 from 06b01aba73341ef4ddc64b4293d03e7c5e12063b to qt-release (66daae05) · Commits · e / os / platform_frameworks_native

cmds/servicemanager/service_manager.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -403,7 +403,11 @@ int main(int argc, char** argv)

		cb.func_audit = audit_callback;
		selinux_set_callback(SELINUX_CB_AUDIT, cb);
		#ifdef VENDORSERVICEMANAGER
		cb.func_log = selinux_vendor_log_callback;
		#else
		cb.func_log = selinux_log_callback;
		#endif
		selinux_set_callback(SELINUX_CB_LOG, cb);

		#ifdef VENDORSERVICEMANAGER

+12 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,16 @@
		* limitations under the License.
		*/

		/**
		* @addtogroup NdkBinder
		* @{
		*/

		/**
		* @file binder_ibinder.h
		* @brief Object which can receive transactions and be sent across processes.
		*/

		#pragma once

		#include <stdint.h>
		@@ -255,3 +265,5 @@ void AIBinder_Weak_delete(AIBinder_Weak** weakBinder);
		__attribute__((warn_unused_result)) AIBinder* AIBinder_Weak_promote(AIBinder_Weak* weakBinder);

		__END_DECLS

		/** @} */

+12 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,16 @@
		* limitations under the License.
		*/

		/**
		* @addtogroup NdkBinder
		* @{
		*/

		/**
		* @file binder_parcel.h
		* @brief A collection of data that can be sent as a single packet.
		*/

		#pragma once

		#include <sys/cdefs.h>
		@@ -150,3 +160,5 @@ binder_status_t AParcel_readByte(const AParcel* parcel, int8_t* value);
		// @END

		__END_DECLS

		/** @} */

+11 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,15 @@
		* limitations under the License.
		*/

		/**
		* @addtogroup NdkBinder
		* @{
		*/

		/**
		* @file binder_status.h
		*/

		#pragma once

		#include <stdint.h>
		@@ -54,3 +63,5 @@ enum {
		typedef int32_t binder_status_t;

		__END_DECLS

		/** @} */

+2 −2

Original line number	Diff line number	Diff line
		@@ -484,7 +484,7 @@ Status<std::vector<size_t>> ProducerQueue::AllocateBuffers(
		if (buffer_slots.size() == 0) {
		// Error out if no buffer is allocated and improted.
		ALOGE_IF(TRACE, "ProducerQueue::AllocateBuffers: no buffer allocated.");
		ErrorStatus(ENOMEM);
		return ErrorStatus(ENOMEM);
		}

		return {std::move(buffer_slots)};
		@@ -505,7 +505,7 @@ Status<size_t> ProducerQueue::AllocateBuffer(uint32_t width, uint32_t height,

		if (status.get().size() == 0) {
		ALOGE_IF(TRACE, "ProducerQueue::AllocateBuffer: no buffer allocated.");
		ErrorStatus(ENOMEM);
		return ErrorStatus(ENOMEM);
		}

		return {status.get()[0]};