release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-41... (6b062a2e) · Commits · e / os / android_frameworks_native

cmds/servicemanager/servicemanager.rc

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,3 +12,4 @@ service servicemanager /system/bin/servicemanager
	onrestart restart drm		onrestart restart drm
	onrestart restart cameraserver		onrestart restart cameraserver
	writepid /dev/cpuset/system-background/tasks		writepid /dev/cpuset/system-background/tasks
			shutdown critical

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,4 +3,4 @@ service vndservicemanager /vendor/bin/vndservicemanager /dev/vndbinder
	user system		user system
	group system readproc		group system readproc
	writepid /dev/cpuset/system-background/tasks		writepid /dev/cpuset/system-background/tasks
			shutdown critical

+18 −2

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,8 @@ enum {
	ENABLE_DISABLE,		ENABLE_DISABLE,
	SET_EVENT_RATE,		SET_EVENT_RATE,
	FLUSH_SENSOR,		FLUSH_SENSOR,
	CONFIGURE_CHANNEL		CONFIGURE_CHANNEL,
			DESTROY,
	};		};

	class BpSensorEventConnection : public BpInterface<ISensorEventConnection>		class BpSensorEventConnection : public BpInterface<ISensorEventConnection>
	@@ -96,6 +97,17 @@ public:
	remote()->transact(CONFIGURE_CHANNEL, data, &reply);		remote()->transact(CONFIGURE_CHANNEL, data, &reply);
	return reply.readInt32();		return reply.readInt32();
	}		}

			virtual void onLastStrongRef(const void* id) {
			destroy();
			BpInterface<ISensorEventConnection>::onLastStrongRef(id);
			}

			protected:
			virtual void destroy() {
			Parcel data, reply;
			remote()->transact(DESTROY, data, &reply);
			}
	};		};

	// Out-of-line virtual method definition to trigger vtable emission in this		// Out-of-line virtual method definition to trigger vtable emission in this
	@@ -150,6 +162,10 @@ status_t BnSensorEventConnection::onTransact(
	reply->writeInt32(result);		reply->writeInt32(result);
	return NO_ERROR;		return NO_ERROR;
	}		}
			case DESTROY: {
			destroy();
			return NO_ERROR;
			}

	}		}
	return BBinder::onTransact(code, data, reply, flags);		return BBinder::onTransact(code, data, reply, flags);

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,8 @@ public:
	virtual status_t setEventRate(int handle, nsecs_t ns) = 0;		virtual status_t setEventRate(int handle, nsecs_t ns) = 0;
	virtual status_t flush() = 0;		virtual status_t flush() = 0;
	virtual int32_t configureChannel(int32_t handle, int32_t rateLevel) = 0;		virtual int32_t configureChannel(int32_t handle, int32_t rateLevel) = 0;
			protected:
			virtual void destroy() = 0; // synchronously release resource hold by remote object
	};		};

	// ----------------------------------------------------------------------------		// ----------------------------------------------------------------------------

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	#define LOG_TAG "Gralloc2"		#define LOG_TAG "Gralloc2"

			#include <hidl/ServiceManagement.h>
	#include <hwbinder/IPCThreadState.h>		#include <hwbinder/IPCThreadState.h>
	#include <ui/Gralloc2.h>		#include <ui/Gralloc2.h>

	@@ -31,6 +32,10 @@ namespace Gralloc2 {

	static constexpr Error kTransactionError = Error::NO_RESOURCES;		static constexpr Error kTransactionError = Error::NO_RESOURCES;

			void Mapper::preload() {
			android::hardware::preloadPassthroughService<hardware::graphics::mapper::V2_0::IMapper>();
			}

	Mapper::Mapper()		Mapper::Mapper()
	{		{
	mMapper = IMapper::getService();		mMapper = IMapper::getService();