From ba362a8c195904d9d5577e05d07f4216b2b56e63 Mon Sep 17 00:00:00 2001 From: Cliff Wu Date: Mon, 21 Feb 2022 19:50:13 +0800 Subject: [PATCH] Added annotations to prevent misapply of this interface by OEM partners - This interface is only suitable for special camera injection hal, general camera hal does not need to implement it. Test: Camera VTS Bug: 219684073 Change-Id: I9b70e4640dff205008f3d6270f402b720b6b4434 --- camera/device/3.7/ICameraInjectionSession.hal | 5 ++++- current.txt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/camera/device/3.7/ICameraInjectionSession.hal b/camera/device/3.7/ICameraInjectionSession.hal index f5797c3b17..9be9b2548b 100644 --- a/camera/device/3.7/ICameraInjectionSession.hal +++ b/camera/device/3.7/ICameraInjectionSession.hal @@ -24,7 +24,10 @@ import @3.6::HalStreamConfiguration; import @3.7::ICameraDeviceSession; /** - * Injection Camera device active session interface. + * Injection camera device active session interface. + * + * Note that this is implemented on a special camera injection hal, if it is a + * general camera hal, it is not necessary to implement this interface. * * When an external camera is injected to replace the internal camera session, the * injection session will be established in camera framework, and then diff --git a/current.txt b/current.txt index 1fedaa0d6e..df6f91dcb0 100644 --- a/current.txt +++ b/current.txt @@ -910,5 +910,6 @@ f767a132ef28275294db15353f14f3876a4048770751931a77d038d4228f2cb7 android.hardwar d0fb32f3ddeb9af7115ab32905225ea69b930d2472be8e9610f0cf136c15aefb android.hardware.keymaster@4.0::IKeymasterDevice # b/210424594 ca62a2a95d173ed323309e5e00f653ad3cceec82a6e5e4976a249cb5aafe2515 android.hardware.neuralnetworks@1.2::types fa76bced6b1b71c40fc706c508a9011284c57f57831cd0cf5f45653ed4ea463e android.hardware.neuralnetworks@1.3::types +700d9de9b47984898789f5706e59285ea6fe83aa5744dccf8491c4b881033ae7 android.hardware.camera.device@3.7::ICameraInjectionSession # There should be no more HIDL HALs - please use AIDL instead.