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/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 453984e..2de5c80 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2047,7 +2047,7 @@
     return Status::ok();
 }
 
- Status CameraService::getConcurrentStreamingCameraIds(
+ Status CameraService::getConcurrentCameraIds(
         std::vector<ConcurrentCameraIdCombination>* concurrentCameraIds) {
     ATRACE_CALL();
     if (!concurrentCameraIds) {
@@ -2063,7 +2063,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) {