Merge "cameraserver: rename getConcurrentStreamingCameraIds -> getConcurrentCameraIds." into rvc-dev
diff --git a/camera/aidl/android/hardware/ICameraService.aidl b/camera/aidl/android/hardware/ICameraService.aidl
index 833893e..ac7a35b 100644
--- a/camera/aidl/android/hardware/ICameraService.aidl
+++ b/camera/aidl/android/hardware/ICameraService.aidl
@@ -119,7 +119,7 @@
* 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 @@
* @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 e0884f4..9bc79e0 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2049,7 +2049,7 @@
return Status::ok();
}
- Status CameraService::getConcurrentStreamingCameraIds(
+ Status CameraService::getConcurrentCameraIds(
std::vector<ConcurrentCameraIdCombination>* concurrentCameraIds) {
ATRACE_CALL();
if (!concurrentCameraIds) {
@@ -2065,7 +2065,7 @@
// First call into the provider and get the set of concurrent camera
// combinations
std::vector<std::unordered_set<std::string>> concurrentCameraCombinations =
- mCameraProviderManager->getConcurrentStreamingCameraIds();
+ mCameraProviderManager->getConcurrentCameraIds();
for (auto &combination : concurrentCameraCombinations) {
std::vector<std::string> validCombination;
for (auto &cameraId : combination) {
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index f12b4cc..1adf15a 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -152,7 +152,7 @@
virtual binder::Status removeListener(
const sp<hardware::ICameraServiceListener>& listener);
- virtual binder::Status getConcurrentStreamingCameraIds(
+ virtual binder::Status getConcurrentCameraIds(
/*out*/
std::vector<hardware::camera2::utils::ConcurrentCameraIdCombination>* concurrentCameraIds);
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 1d794a1..cc369fa 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1362,7 +1362,7 @@
// Get list of concurrent streaming camera device combinations
if (mMinorVersion >= 6) {
- res = getConcurrentStreamingCameraIdsInternalLocked(interface2_6);
+ res = getConcurrentCameraIdsInternalLocked(interface2_6);
if (res != OK) {
return res;
}
@@ -1616,7 +1616,7 @@
return OK;
}
-status_t CameraProviderManager::ProviderInfo::getConcurrentStreamingCameraIdsInternalLocked(
+status_t CameraProviderManager::ProviderInfo::getConcurrentCameraIdsInternalLocked(
sp<provider::V2_6::ICameraProvider> &interface2_6) {
if (interface2_6 == nullptr) {
ALOGE("%s: null interface provided", __FUNCTION__);
@@ -1669,7 +1669,7 @@
if (castResult.isOk()) {
sp<provider::V2_6::ICameraProvider> 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__);
@@ -2809,7 +2809,7 @@
// Expects to have mInterfaceMutex locked
std::vector<std::unordered_set<std::string>>
-CameraProviderManager::getConcurrentStreamingCameraIds() const {
+CameraProviderManager::getConcurrentCameraIds() const {
std::vector<std::unordered_set<std::string>> deviceIdCombinations;
std::lock_guard<std::mutex> lock(mInterfaceMutex);
for (auto &provider : mProviders) {
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h
index 5359c39..50044d8 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.h
+++ b/services/camera/libcameraservice/common/CameraProviderManager.h
@@ -221,7 +221,7 @@
&cameraIdsAndSessionConfigs,
bool *isSupported);
- std::vector<std::unordered_set<std::string>> getConcurrentStreamingCameraIds() const;
+ std::vector<std::unordered_set<std::string>> getConcurrentCameraIds() const;
/**
* Check for device support of specific stream combination.
*/
@@ -630,7 +630,7 @@
// Expects to have mLock locked
status_t reCacheConcurrentStreamingCameraIdsLocked();
// Expects to have mLock locked
- status_t getConcurrentStreamingCameraIdsInternalLocked(
+ status_t getConcurrentCameraIdsInternalLocked(
sp<hardware::camera::provider::V2_6::ICameraProvider> &interface2_6);
};