Merge "Cameraserver: Use multiple hwbinder threads" (1cbdb417) · Commits · e / os / android_frameworks_av

camera/cameraserver/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ LOCAL_SHARED_LIBRARIES := \
		libutils \
		libui \
		libbinder \
		libhidltransport \
		android.hardware.camera.common@1.0 \
		android.hardware.camera.provider@2.4 \
		android.hardware.camera.device@1.0 \

+4 −1

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		#define LOG_TAG "cameraserver"
		//#define LOG_NDEBUG 0

		// from LOCAL_C_INCLUDES
		#include "CameraService.h"
		#include <hidl/HidlTransportSupport.h>

		using namespace android;

		@@ -26,6 +26,9 @@ int main(int argc __unused, char** argv __unused)
		{
		signal(SIGPIPE, SIG_IGN);

		// Set 3 threads for HIDL calls
		hardware::configureRpcThreadpool(3, /willjoin/ false);

		sp<ProcessState> proc(ProcessState::self());
		sp<IServiceManager> sm = defaultServiceManager();
		ALOGI("ServiceManager: %p", sm.get());

+3 −3

Original line number	Diff line number	Diff line
		@@ -54,9 +54,6 @@ status_t CameraProviderManager::initialize(wp<CameraProviderManager::StatusListe
		mListener = listener;
		mServiceProxy = proxy;

		// See if there's a passthrough HAL, but let's not complain if there's not
		addProvider(kLegacyProviderName, /expected/ false);

		// Registering will trigger notifications for all already-known providers
		bool success = mServiceProxy->registerForNotifications(
		/* instance name, empty means no filter */ "",
		@@ -67,6 +64,9 @@ status_t CameraProviderManager::initialize(wp<CameraProviderManager::StatusListe
		return INVALID_OPERATION;
		}

		// See if there's a passthrough HAL, but let's not complain if there's not
		addProvider(kLegacyProviderName, /expected/ false);

		return OK;
		}