Merge "Bluetooth Audio HIDL 2.1 rev up"
diff --git a/display/current.txt b/display/current.txt
index d7e5a02..fef0227 100644
--- a/display/current.txt
+++ b/display/current.txt
@@ -71,3 +71,4 @@
f724000c84dd66ffaea8b3edc610f13381a62513854e35d89b3f4a4daad620d0 vendor.qti.hardware.display.composer@3.0::IQtiComposerClient
c85fce19541fb31c8ce4927166a4b50da1e5d50a98594bcaae2f8b2eec12fb7d vendor.qti.hardware.display.allocator@4.0::IQtiAllocator
f49205d41f011a96c6d238ea69f7b6c9d159809f4ecabef04ca4ccdb195d57b5 vendor.qti.hardware.display.mapper@4.0::IQtiMapper
+9f484e68c3e4faef0a0f601ff7074d0431499cfaceba43b42fbc35c8264fbddf vendor.qti.hardware.display.mapperextensions@1.2::IQtiMapperExtensions
diff --git a/display/mapperextensions/1.2/Android.bp b/display/mapperextensions/1.2/Android.bp
new file mode 100644
index 0000000..778ee1a
--- /dev/null
+++ b/display/mapperextensions/1.2/Android.bp
@@ -0,0 +1,17 @@
+// This file is autogenerated by hidl-gen -Landroidbp.
+
+hidl_interface {
+ name: "vendor.qti.hardware.display.mapperextensions@1.2",
+ owner: "qti",
+ root: "vendor.qti.hardware.display",
+ system_ext_specific: true,
+ srcs: [
+ "IQtiMapperExtensions.hal",
+ ],
+ interfaces: [
+ "android.hidl.base@1.0",
+ "vendor.qti.hardware.display.mapperextensions@1.0",
+ "vendor.qti.hardware.display.mapperextensions@1.1",
+ ],
+ gen_java: false,
+}
diff --git a/display/mapperextensions/1.2/IQtiMapperExtensions.hal b/display/mapperextensions/1.2/IQtiMapperExtensions.hal
new file mode 100644
index 0000000..2e34cf4
--- /dev/null
+++ b/display/mapperextensions/1.2/IQtiMapperExtensions.hal
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2019-2020 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.display.mapperextensions@1.2;
+
+import @1.1::IQtiMapperExtensions;
+import @1.0::Error;
+
+interface IQtiMapperExtensions extends @1.1::IQtiMapperExtensions {
+
+ /*
+ * Copy graphics metadata.
+ * Set dst buffer to src buffer.
+ */
+ @callflow(next="*")
+ copyMetaData(pointer src, pointer dst) generates (Error error);
+
+ /*
+ * Copy graphics metadata from src buffer.
+ * Set virtual address to src buffer.
+ */
+ @callflow(next="*")
+ setMetadataBlob(vec<uint8_t> src, pointer dst) generates (Error error);
+
+ /*
+ * Get graphics metadata blob from src buffer.
+ */
+ @callflow(next="*")
+ getMetadataBlob(pointer src) generates (Error error, vec<uint8_t> data);
+};
\ No newline at end of file