From 61c3ac2a69cefd1c5d38105fb763d8886f4760e8 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Fri, 20 Mar 2020 16:15:47 -0700 Subject: [PATCH] Clarify getConcurrentStreamingCameraids may return hidden physical camera ids as well. Bug: 151891611 Test: builds Change-Id: I889065b379d9966e9cc8a225fb335685f2f065cd Signed-off-by: Jayant Chowdhary --- camera/provider/2.6/ICameraProvider.hal | 7 +++++++ current.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/camera/provider/2.6/ICameraProvider.hal b/camera/provider/2.6/ICameraProvider.hal index 5651550e2d..ed1d31dd57 100644 --- a/camera/provider/2.6/ICameraProvider.hal +++ b/camera/provider/2.6/ICameraProvider.hal @@ -76,6 +76,13 @@ interface ICameraProvider extends @2.5::ICameraProvider { * configuration settings exposed through camera metadata), should the sum * of resource costs for the combination be <= 100. * + * The lists of camera id combinations returned by this method may contain + * hidden physical camera ids. If a combination does contain hidden physical + * camera ids, the camera framework must be able to open any logical cameras + * that contain these hidden physical camera ids in their + * ANDROID_LOGICAL_MULTI_CAMERA_PHYSICAL_IDS list, in addition to the other + * camera ids advertised in the combination, for concurrent operation. + * * @return status Status code for the operation * @return cameraIds a list of camera id combinations that support * concurrent stream configurations with the minimum guarantees diff --git a/current.txt b/current.txt index 5d862d833b..0cb2fde1bf 100644 --- a/current.txt +++ b/current.txt @@ -641,7 +641,7 @@ ae6315fd42196478ac08441cb489d854118001bca5b9b9fd58af5110952be30e android.hardwar 74049a402be913963edfdd80828a53736570e9d8124a1bf18166b6ed46a6b0ab android.hardware.boot@1.1::types b8c63679e1a3874b356f3e691aecce1191d38f59063cf2ed2dce8a9d4cabf00e android.hardware.camera.device@3.6::ICameraDevice a35d5151b48505f06a775b38c0e2e265f80a845d92802324c643565807f81c53 android.hardware.camera.device@3.6::types -99aae72ae75a8ddf63ccffbc585f3a55f4d0847b4adff3d7a0f8bd9e2305bec1 android.hardware.camera.provider@2.6::ICameraProvider +21086e1c7a2acc0ebe0ff8561b11f3c2009be687a92d79b608a5f00b16c5f598 android.hardware.camera.provider@2.6::ICameraProvider 8f8d9463508ff9cae88eb35c429fd0e2dbca0ca8f5de7fdf836cc0c4370becb6 android.hardware.camera.provider@2.6::ICameraProviderCallback c1aa508d00b66ed5feefea398fd5edf28fa651ac89773adad7dfda4e0a73a952 android.hardware.cas@1.2::ICas 9811f867def49b420d8c707f7e38d3bdd64f835244e1d2a5e9762ab9835672dc android.hardware.cas@1.2::ICasListener