Merge "camera: Remove lazy_aidl_wait_for_service aconfig flag" into main (90a94642) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -33,13 +33,6 @@ flag {
		bug: "238348881"
		}

		flag {
		namespace: "camera_platform"
		name: "lazy_aidl_wait_for_service"
		description: "Use waitForService instead of getService with lazy AIDL HALs"
		bug: "285546208"
		}

		flag {
		namespace: "camera_platform"
		name: "session_hal_buf_manager"

services/camera/libcameraservice/common/CameraProviderManager.cpp

+8 −19

Original line number	Diff line number	Diff line
		@@ -149,11 +149,7 @@ CameraProviderManager::AidlServiceInteractionProxyImpl::getService(
		using aidl::android::hardware::camera::provider::ICameraProvider;

		AIBinder* binder = nullptr;
		if (flags::lazy_aidl_wait_for_service()) {
		binder = AServiceManager_waitForService(serviceName.c_str());
		} else {
		binder = AServiceManager_checkService(serviceName.c_str());
		}

		if (binder == nullptr) {
		ALOGE("%s: AIDL Camera provider HAL '%s' is not actually available, despite waiting "
		@@ -2192,14 +2188,11 @@ status_t CameraProviderManager::addAidlProviderLocked(const std::string& newProv
		bool preexisting =
		(mAidlProviderWithBinders.find(newProvider) != mAidlProviderWithBinders.end());
		using aidl::android::hardware::camera::provider::ICameraProvider;
		std::string providerNameUsed =
		newProvider.substr(std::string(ICameraProvider::descriptor).size() + 1);
		if (flags::lazy_aidl_wait_for_service()) {

		// 'newProvider' has the fully qualified name of the provider service in case of AIDL.
		// ProviderInfo::mProviderName also has the fully qualified name - so we just compare them
		// here.
		providerNameUsed = newProvider;
		}
		std::string providerNameUsed = newProvider;

		for (const auto& providerInfo : mProviders) {
		if (providerInfo->mProviderName == providerNameUsed) {
		@@ -2305,15 +2298,11 @@ status_t CameraProviderManager::removeProvider(const std::string& provider) {
		for (const auto& providerInfo : mProviders) {
		if (providerInfo->mProviderName == removedProviderName) {
		IPCTransport providerTransport = providerInfo->getIPCTransport();
		std::string removedAidlProviderName = getFullAidlProviderName(removedProviderName);
		if (flags::lazy_aidl_wait_for_service()) {
		removedAidlProviderName = removedProviderName;
		}
		switch(providerTransport) {
		case IPCTransport::HIDL:
		return tryToInitializeHidlProviderLocked(removedProviderName, providerInfo);
		case IPCTransport::AIDL:
		return tryToInitializeAidlProviderLocked(removedAidlProviderName,
		return tryToInitializeAidlProviderLocked(removedProviderName,
		providerInfo);
		default:
		ALOGE("%s Unsupported Transport %d", __FUNCTION__, eToI(providerTransport));
		@@ -2479,7 +2468,7 @@ void CameraProviderManager::ProviderInfo::removeAllDevices() {

		bool CameraProviderManager::ProviderInfo::isExternalLazyHAL() const {
		std::string providerName = mProviderName;
		if (flags::lazy_aidl_wait_for_service() && getIPCTransport() == IPCTransport::AIDL) {
		if (getIPCTransport() == IPCTransport::AIDL) {
		using aidl::android::hardware::camera::provider::ICameraProvider;
		providerName =
		mProviderName.substr(std::string(ICameraProvider::descriptor).size() + 1);

services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp

+1 −4

Original line number	Diff line number	Diff line
		@@ -109,11 +109,8 @@ status_t AidlProviderInfo::initializeAidlProvider(
		std::shared_ptr<ICameraProvider>& interface, int64_t currentDeviceState) {

		using aidl::android::hardware::camera::provider::ICameraProvider;
		std::string parsedProviderName = mProviderName;
		if (flags::lazy_aidl_wait_for_service()) {
		parsedProviderName =
		std::string parsedProviderName =
		mProviderName.substr(std::string(ICameraProvider::descriptor).size() + 1);
		}

		status_t res = parseProviderName(parsedProviderName, &mType, &mId);
		if (res != OK) {