Merge 6e37af7b229e758b20a335c259f149e49ad5f3fb on remote branch

Change-Id: Id92bc9db681cdc7b70b85c1372f4d70ac7881e65

6 files changed, 127 insertions, 1 deletions

diff --git a/display/allocator/4.0/IQtiAllocator.hal b/display/allocator/4.0/IQtiAllocator.hal
new file mode 100644
index 0000000..76f4136
--- /dev/null
+++ b/display/allocator/4.0/IQtiAllocator.hal
@@ -0,0 +1,36 @@
+/*
+* 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.allocator@4.0;
+
+import android.hardware.graphics.allocator@4.0::IAllocator;
+
+interface IQtiAllocator extends IAllocator {
+};
+
diff --git a/display/allocator/4.0/hidl_gen_version b/display/allocator/4.0/hidl_gen_version
new file mode 100644
index 0000000..9e7c0da
--- /dev/null
+++ b/display/allocator/4.0/hidl_gen_version
@@ -0,0 +1 @@
+version=3
diff --git a/display/config/1.16/IDisplayConfig.hal b/display/config/1.16/IDisplayConfig.hal
new file mode 100644
index 0000000..d1b005b
--- /dev/null
+++ b/display/config/1.16/IDisplayConfig.hal
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 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.display.config@1.16;
+
+import @1.15::IDisplayConfig;
+
+interface IDisplayConfig extends @1.15::IDisplayConfig {
+    /*
+     * allowIdleFallback on client(as of now SurfaceFlinger) start
+     *
+     * @return error is NONE upon success.
+     */
+    @callflow(next="*")
+    allowIdleFallback() generates (int32_t error);
+};
diff --git a/display/current.txt b/display/current.txt
index 9df322a..de8ba9b 100644
--- a/display/current.txt
+++ b/display/current.txt
@@ -1,4 +1,4 @@
-#Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+#Copyright (c) 2018-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
@@ -64,4 +64,5 @@ cc81da1cfc8f045fa4183a7ab2f5f34cb863b310b8d04bf7db661a58ec9ea5c3 vendor.display.
 be4de6eea1098375e80d26bd86d0e239a3d739ec7dfa43b1b2fa5e6f75c86966 vendor.display.config@1.15::IDisplayQsyncCallback
 5862c0c085c9e0b6d8b8a11e4a9765a6a9250874d7c1a9b0f6b566598da31593 vendor.display.config@2.0::IDisplayConfig
 14fcf170f04a9878bf085b2aa4d75ef5e3d241926bef18e58d6d254e000ff689 vendor.display.config@2.0::IDisplayConfigCallback
+ada1c82f1ba85c9f403c4b91d24ebc6dfc2e796a7727bcca23f4e2ea68800f35 vendor.display.config@1.16::IDisplayConfig
 
diff --git a/display/mapper/4.0/IQtiMapper.hal b/display/mapper/4.0/IQtiMapper.hal
new file mode 100644
index 0000000..cf116af
--- /dev/null
+++ b/display/mapper/4.0/IQtiMapper.hal
@@ -0,0 +1,45 @@
+/*
+* 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.mapper@4.0;
+
+import android.hardware.graphics.mapper@4.0;
+import android.hardware.graphics.mapper@4.0::types;
+import vendor.qti.hardware.display.mapperextensions@1.0::IQtiMapperExtensions;
+
+interface IQtiMapper extends IMapper {
+    /*
+     * Returns an interface to QTI specific extensions for IMapper
+     * If there are newer versions of IQtiMapper with the same major revision (1)
+     * the client can cast this extensions object to a newer revision
+     */
+    @callflow(next="*")
+    getMapperExtensions() generates (Error error, IQtiMapperExtensions extensions);
+};
+
diff --git a/display/mapper/4.0/hidl_gen_version b/display/mapper/4.0/hidl_gen_version
new file mode 100644
index 0000000..9e7c0da
--- /dev/null
+++ b/display/mapper/4.0/hidl_gen_version
@@ -0,0 +1 @@
+version=3