Merge cherrypicks of [13083486, 13083716, 13083431, 13083573, 13083545,... (f76b5eb5) · Commits · e / os / android_frameworks_native-old

libs/binder/LazyServiceRegistrar.cpp

+35 −11

Original line number	Diff line number	Diff line
		@@ -29,16 +29,12 @@ namespace internal {

		using AidlServiceManager = android::os::IServiceManager;

		class ClientCounterCallback : public ::android::os::BnClientCallback {
		class ClientCounterCallbackImpl : public ::android::os::BnClientCallback {
		public:
		ClientCounterCallback() : mNumConnectedServices(0), mForcePersist(false) {}
		ClientCounterCallbackImpl() : mNumConnectedServices(0), mForcePersist(false) {}

		bool registerService(const sp<IBinder>& service, const std::string& name,
		bool allowIsolated, int dumpFlags);

		/**
		* Set a flag to prevent services from automatically shutting down
		*/
		void forcePersist(bool persist);

		protected:
		@@ -69,7 +65,23 @@ private:
		bool mForcePersist;
		};

		bool ClientCounterCallback::registerService(const sp<IBinder>& service, const std::string& name,
		class ClientCounterCallback {
		public:
		ClientCounterCallback();

		bool registerService(const sp<IBinder>& service, const std::string& name,
		bool allowIsolated, int dumpFlags);

		/**
		* Set a flag to prevent services from automatically shutting down
		*/
		void forcePersist(bool persist);

		private:
		sp<ClientCounterCallbackImpl> mImpl;
		};

		bool ClientCounterCallbackImpl::registerService(const sp<IBinder>& service, const std::string& name,
		bool allowIsolated, int dumpFlags) {
		auto manager = interface_cast<AidlServiceManager>(asBinder(defaultServiceManager()));

		@@ -95,7 +107,7 @@ bool ClientCounterCallback::registerService(const sp<IBinder>& service, const st
		return true;
		}

		void ClientCounterCallback::forcePersist(bool persist) {
		void ClientCounterCallbackImpl::forcePersist(bool persist) {
		mForcePersist = persist;
		if(!mForcePersist) {
		// Attempt a shutdown in case the number of clients hit 0 while the flag was on
		@@ -107,7 +119,7 @@ void ClientCounterCallback::forcePersist(bool persist) {
		* onClients is oneway, so no need to worry about multi-threading. Note that this means multiple
		* invocations could occur on different threads however.
		*/
		Status ClientCounterCallback::onClients(const sp<IBinder>& service, bool clients) {
		Status ClientCounterCallbackImpl::onClients(const sp<IBinder>& service, bool clients) {
		if (clients) {
		mNumConnectedServices++;
		} else {
		@@ -122,7 +134,7 @@ Status ClientCounterCallback::onClients(const sp<IBinder>& service, bool clients
		return Status::ok();
		}

		void ClientCounterCallback::tryShutdown() {
		void ClientCounterCallbackImpl::tryShutdown() {
		if(mNumConnectedServices > 0) {
		// Should only shut down if there are no clients
		return;
		@@ -143,7 +155,6 @@ void ClientCounterCallback::tryShutdown() {

		bool success = manager->tryUnregisterService(entry.first, entry.second.service).isOk();


		if (!success) {
		ALOGI("Failed to unregister service %s", entry.first.c_str());
		break;
		@@ -168,6 +179,19 @@ void ClientCounterCallback::tryShutdown() {
		}
		}

		ClientCounterCallback::ClientCounterCallback() {
		mImpl = new ClientCounterCallbackImpl();
		}

		bool ClientCounterCallback::registerService(const sp<IBinder>& service, const std::string& name,
		bool allowIsolated, int dumpFlags) {
		return mImpl->registerService(service, name, allowIsolated, dumpFlags);
		}

		void ClientCounterCallback::forcePersist(bool persist) {
		mImpl->forcePersist(persist);
		}

		} // namespace internal

		LazyServiceRegistrar::LazyServiceRegistrar() {

services/sensorservice/SensorEventConnection.cpp

+18 −10

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

		#include <log/log.h>
		#include <sys/socket.h>
		#include <utils/threads.h>

		@@ -53,20 +54,13 @@ SensorService::SensorEventConnection::SensorEventConnection(
		SensorService::SensorEventConnection::~SensorEventConnection() {
		ALOGD_IF(DEBUG_CONNECTIONS, "~SensorEventConnection(%p)", this);
		destroy();
		}

		void SensorService::SensorEventConnection::destroy() {
		Mutex::Autolock _l(mDestroyLock);

		// destroy once only
		if (mDestroyed) {
		return;
		}

		mService->cleanupConnection(this);
		if (mEventCache != nullptr) {
		delete[] mEventCache;
		}
		}

		void SensorService::SensorEventConnection::destroy() {
		mDestroyed = true;
		}

		@@ -679,6 +673,11 @@ status_t SensorService::SensorEventConnection::enableDisable(
		int handle, bool enabled, nsecs_t samplingPeriodNs, nsecs_t maxBatchReportLatencyNs,
		int reservedFlags)
		{
		if (mDestroyed) {
		android_errorWriteLog(0x534e4554, "168211968");
		return DEAD_OBJECT;
		}

		status_t err;
		if (enabled) {
		err = mService->enable(this, handle, samplingPeriodNs, maxBatchReportLatencyNs,
		@@ -693,10 +692,19 @@ status_t SensorService::SensorEventConnection::enableDisable(
		status_t SensorService::SensorEventConnection::setEventRate(
		int handle, nsecs_t samplingPeriodNs)
		{
		if (mDestroyed) {
		android_errorWriteLog(0x534e4554, "168211968");
		return DEAD_OBJECT;
		}

		return mService->setEventRate(this, handle, samplingPeriodNs, mOpPackageName);
		}

		status_t SensorService::SensorEventConnection::flush() {
		if (mDestroyed) {
		return DEAD_OBJECT;
		}

		return mService->flushSensor(this, mOpPackageName);
		}

services/sensorservice/SensorEventConnection.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#ifndef ANDROID_SENSOR_EVENT_CONNECTION_H
		#define ANDROID_SENSOR_EVENT_CONNECTION_H

		#include <atomic>
		#include <stdint.h>
		#include <sys/types.h>
		#include <unordered_map>
		@@ -182,8 +183,8 @@ private:
		int mTotalAcksNeeded, mTotalAcksReceived;
		#endif

		mutable Mutex mDestroyLock;
		bool mDestroyed;
		// Used to track if this object was inappropriately used after destroy().
		std::atomic_bool mDestroyed;

		// Store a mapping of sensor handles to required AppOp for a sensor. This map only contains a
		// valid mapping for sensors that require a permission in order to reduce the lookup time.