From 236f51d89ae538c2fe60df4ba4d4c9ca4ca3f473 Mon Sep 17 00:00:00 2001 From: Han Wang <416810799@qq.com> Date: Tue, 31 Mar 2020 03:51:37 +0200 Subject: display: Remove mapper 4.0 and allocator 4.0 * android.hardware.graphics.{allocator,mapper}@4.0 doesn't exist on 10. Change-Id: Ie13dac160c3579dba87772365a59a3ab68ca4899 --- display/allocator/4.0/IQtiAllocator.hal | 36 -------------------------- display/allocator/4.0/hidl_gen_version | 1 - display/mapper/4.0/IQtiMapper.hal | 45 --------------------------------- display/mapper/4.0/hidl_gen_version | 1 - 4 files changed, 83 deletions(-) delete mode 100644 display/allocator/4.0/IQtiAllocator.hal delete mode 100644 display/allocator/4.0/hidl_gen_version delete mode 100644 display/mapper/4.0/IQtiMapper.hal delete mode 100644 display/mapper/4.0/hidl_gen_version diff --git a/display/allocator/4.0/IQtiAllocator.hal b/display/allocator/4.0/IQtiAllocator.hal deleted file mode 100644 index 76f4136..0000000 --- a/display/allocator/4.0/IQtiAllocator.hal +++ /dev/null @@ -1,36 +0,0 @@ -/* -* 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 deleted file mode 100644 index 9e7c0da..0000000 --- a/display/allocator/4.0/hidl_gen_version +++ /dev/null @@ -1 +0,0 @@ -version=3 diff --git a/display/mapper/4.0/IQtiMapper.hal b/display/mapper/4.0/IQtiMapper.hal deleted file mode 100644 index cf116af..0000000 --- a/display/mapper/4.0/IQtiMapper.hal +++ /dev/null @@ -1,45 +0,0 @@ -/* -* 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 deleted file mode 100644 index 9e7c0da..0000000 --- a/display/mapper/4.0/hidl_gen_version +++ /dev/null @@ -1 +0,0 @@ -version=3 -- cgit v1.2.3