From cad23c25737f100ac117835aa234c02f2013c0a9 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Tue, 10 Mar 2020 15:04:59 -0700 Subject: [PATCH] cameraserver: rename getConcurrentStreamingCameraIds -> getConcurrentCameraIds. Bug: 150896133 Test: builds Test: atest ConcurrentCameraTest.java Change-Id: Id73f15164200a4cc91354b67784bab3c470caf57 Signed-off-by: Jayant Chowdhary --- camera/aidl/android/hardware/ICameraService.aidl | 4 ++-- services/camera/libcameraservice/CameraService.cpp | 4 ++-- services/camera/libcameraservice/CameraService.h | 2 +- .../libcameraservice/common/CameraProviderManager.cpp | 8 ++++---- .../libcameraservice/common/CameraProviderManager.h | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/camera/aidl/android/hardware/ICameraService.aidl b/camera/aidl/android/hardware/ICameraService.aidl index 833893e1e4..ac7a35b9f2 100644 --- a/camera/aidl/android/hardware/ICameraService.aidl +++ b/camera/aidl/android/hardware/ICameraService.aidl @@ -119,7 +119,7 @@ interface ICameraService * Get a list of combinations of camera ids which support concurrent streaming. * */ - ConcurrentCameraIdCombination[] getConcurrentStreamingCameraIds(); + ConcurrentCameraIdCombination[] getConcurrentCameraIds(); /** * Check whether a particular set of session configurations are concurrently supported by the @@ -129,7 +129,7 @@ interface ICameraService * @return true - the set of concurrent camera id and stream combinations is supported. * false - the set of concurrent camera id and stream combinations is not supported * OR the method was called with a set of camera ids not returned by - * getConcurrentMultiStreamingCameraIds(). + * getConcurrentCameraIds(). */ boolean isConcurrentSessionConfigurationSupported( in CameraIdAndSessionConfiguration[] sessions); diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 453984e824..2de5c80a0c 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -2047,7 +2047,7 @@ Status CameraService::notifyDeviceStateChange(int64_t newState) { return Status::ok(); } - Status CameraService::getConcurrentStreamingCameraIds( + Status CameraService::getConcurrentCameraIds( std::vector* concurrentCameraIds) { ATRACE_CALL(); if (!concurrentCameraIds) { @@ -2063,7 +2063,7 @@ Status CameraService::notifyDeviceStateChange(int64_t newState) { // First call into the provider and get the set of concurrent camera // combinations std::vector> concurrentCameraCombinations = - mCameraProviderManager->getConcurrentStreamingCameraIds(); + mCameraProviderManager->getConcurrentCameraIds(); for (auto &combination : concurrentCameraCombinations) { std::vector validCombination; for (auto &cameraId : combination) { diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 265a572893..751833e53e 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -152,7 +152,7 @@ public: virtual binder::Status removeListener( const sp& listener); - virtual binder::Status getConcurrentStreamingCameraIds( + virtual binder::Status getConcurrentCameraIds( /*out*/ std::vector* concurrentCameraIds); diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp index 2c97a383ec..aac49ef620 100644 --- a/services/camera/libcameraservice/common/CameraProviderManager.cpp +++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp @@ -1352,7 +1352,7 @@ status_t CameraProviderManager::ProviderInfo::initialize( // Get list of concurrent streaming camera device combinations if (mMinorVersion >= 6) { - res = getConcurrentStreamingCameraIdsInternalLocked(interface2_6); + res = getConcurrentCameraIdsInternalLocked(interface2_6); if (res != OK) { return res; } @@ -1606,7 +1606,7 @@ status_t CameraProviderManager::ProviderInfo::dump(int fd, const Vector &interface2_6) { if (interface2_6 == nullptr) { ALOGE("%s: null interface provided", __FUNCTION__); @@ -1659,7 +1659,7 @@ status_t CameraProviderManager::ProviderInfo::reCacheConcurrentStreamingCameraId if (castResult.isOk()) { sp interface2_6 = castResult; if (interface2_6 != nullptr) { - return getConcurrentStreamingCameraIdsInternalLocked(interface2_6); + return getConcurrentCameraIdsInternalLocked(interface2_6); } else { // This should not happen since mMinorVersion >= 6 ALOGE("%s: mMinorVersion was >= 6, but interface2_6 was nullptr", __FUNCTION__); @@ -2796,7 +2796,7 @@ status_t HidlVendorTagDescriptor::createDescriptorFromHidl( // Expects to have mInterfaceMutex locked std::vector> -CameraProviderManager::getConcurrentStreamingCameraIds() const { +CameraProviderManager::getConcurrentCameraIds() const { std::vector> deviceIdCombinations; std::lock_guard lock(mInterfaceMutex); for (auto &provider : mProviders) { diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h index 1a0298018d..9a715b7ff0 100644 --- a/services/camera/libcameraservice/common/CameraProviderManager.h +++ b/services/camera/libcameraservice/common/CameraProviderManager.h @@ -221,7 +221,7 @@ public: &cameraIdsAndSessionConfigs, bool *isSupported); - std::vector> getConcurrentStreamingCameraIds() const; + std::vector> getConcurrentCameraIds() const; /** * Check for device support of specific stream combination. */ @@ -630,7 +630,7 @@ private: // Expects to have mLock locked status_t reCacheConcurrentStreamingCameraIdsLocked(); // Expects to have mLock locked - status_t getConcurrentStreamingCameraIdsInternalLocked( + status_t getConcurrentCameraIdsInternalLocked( sp &interface2_6); };