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>

camera/aidl/android/hardware/ICameraService.aidl

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