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.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);
     };