Merge c46b50db3c8396a64352b8fdf0eb174d6967febd on remote branchHEADsugisawa

Change-Id: I0c4fb497f1aa2f145c8eb4f8803bca60789051f8

4 files changed, 158 insertions, 0 deletions

diff --git a/camera/aon/1.1/Android.bp b/camera/aon/1.1/Android.bp
new file mode 100644
index 0000000..b1e2ede
--- /dev/null
+++ b/camera/aon/1.1/Android.bp
@@ -0,0 +1,15 @@
+hidl_interface {
+    name: "vendor.qti.hardware.camera.aon@1.1",
+    root: "vendor.qti.hardware.camera",
+    system_ext_specific: true,
+    srcs: [
+        "types.hal",
+        "IAONService.hal",
+        "IAONServiceCallBack.hal",
+    ],
+    interfaces: [
+        "vendor.qti.hardware.camera.aon@1.0",
+        "android.hidl.base@1.0",
+    ],
+    gen_java: true,
+}
diff --git a/camera/aon/1.1/IAONService.hal b/camera/aon/1.1/IAONService.hal
new file mode 100644
index 0000000..1ab20c5
--- /dev/null
+++ b/camera/aon/1.1/IAONService.hal
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *    * Neither the name of The Linux Foundation. nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package vendor.qti.hardware.camera.aon@1.1;
+
+import vendor.qti.hardware.camera.aon@1.0;
+
+import @1.1::types;
+import @1.1::IAONServiceCallBack;
+
+interface IAONService extends @1.0::IAONService {
+
+
+    /**
+     * Get capabilities supported by AON Service.
+     *
+     * @return serviceCapabilities list of AON service types supported by service.
+     *
+     */
+    getCapabilities_v1() generates (vec<AONServiceType> serviceCapabilities);
+
+    /**
+     * Registers for AON service events.
+     *
+     * @param  callback            callback function that gets called during AON event
+     * @param  serviceType         AON service type that client is interested in
+     * @return status              Returns status of function.
+     *                             Returns 0 in case of success; non-zero otherwise
+     * @return clientHandle        AON Service assigns a valid client handle upon successfull return
+     *                             Any value greater than 0 in case of success.
+     *                             0 in case of failure
+     *
+     */
+    registerClient_v1(IAONServiceCallBack callback, AONServiceType serviceType)
+                    generates (Status status, uint64_t clientHandle);
+
+};
diff --git a/camera/aon/1.1/IAONServiceCallBack.hal b/camera/aon/1.1/IAONServiceCallBack.hal
new file mode 100644
index 0000000..8fe77d4
--- /dev/null
+++ b/camera/aon/1.1/IAONServiceCallBack.hal
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *    * Neither the name of The Linux Foundation. nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package vendor.qti.hardware.camera.aon@1.1;
+
+import @1.1::types;
+import vendor.qti.hardware.camera.aon@1.0;
+
+/** AON Service callback interface.
+ *  This callback will be invoked when any client registers for AON Service
+ *  and specific AON event triggered by hardware/lower layers */
+interface IAONServiceCallBack extends @1.0::IAONServiceCallBack {
+    // No new APIs are added in 1.1 callback
+};
diff --git a/camera/aon/1.1/types.hal b/camera/aon/1.1/types.hal
new file mode 100644
index 0000000..a8a8090
--- /dev/null
+++ b/camera/aon/1.1/types.hal
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *    * Neither the name of The Linux Foundation. nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package vendor.qti.hardware.camera.aon@1.1;
+
+import vendor.qti.hardware.camera.aon@1.0;
+import vendor.qti.hardware.camera.aon@1.0::types;
+import vendor.qti.hardware.camera.aon@1.0::AONServiceType;
+
+enum AONServiceType     : @1.0::AONServiceType
+{
+    /** Enum for Face Not Detect type **/
+    FaceNotDetect       = 2,
+};
\ No newline at end of file