commit cad23c25737f100ac117835aa234c02f2013c0a9
author Jayant Chowdhary <jchowdhary@google.com> Tue Mar 10 15:04:59 2020 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Wed Mar 11 16:11:14 2020 -0700
tree 06b8ffe5296c19a4256e990ac2eced37bc209caa
parent 904b623c8cdbd43a2089c5d3b45240757bd3bc81

cameraserver: rename getConcurrentStreamingCameraIds -> getConcurrentCameraIds.

Bug: 150896133

Test: builds
Test: atest ConcurrentCameraTest.java

Change-Id: Id73f15164200a4cc91354b67784bab3c470caf57
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 2c97a38..aac49ef 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1352,7 +1352,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;
         }
@@ -1606,7 +1606,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__);
@@ -1659,7 +1659,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__);
@@ -2796,7 +2796,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) {

services/camera/libcameraservice/common/CameraProviderManager.h

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h
index 1a02980..9a715b7 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);
     };