From a88f0920861b968ea878f61c2a624dda7b663900 Mon Sep 17 00:00:00 2001
From: Dante Russo <drusso@codeaurora.org>
Date: Wed, 10 Jul 2019 12:59:23 -0700
Subject: Revert "Remove support GNSS HIDL 1.1 for legacy devices"

This reverts commit 974fedbe
Legacy devices must support GNSS HIDL 1.1 afterall
to avoid failure of VtsTrebleFrameworkVintfTest
and VTS test for GNSS HIDL 1.1 are being changed
to support legacy devices that do not support
features Blacklisting and Power Modes.

Change-Id: I2ad0776295979d5cddcfa0f76692253d7c084fd2
CRs-fixed: 2487572
---
 android/2.0/Android.mk                             |  4 ---
 .../android.hardware.gnss@2.0-service-qti.xml      | 36 ----------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 android/2.0/legacy/android.hardware.gnss@2.0-service-qti.xml

(limited to 'android')

diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk
index 83113a3..7c55504 100644
--- a/android/2.0/Android.mk
+++ b/android/2.0/Android.mk
@@ -70,11 +70,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := android.hardware.gnss@2.0-service-qti
-ifeq ($(GNSS_HIDL_LEGACY_MEASURMENTS),true)
-LOCAL_VINTF_FRAGMENTS := legacy/android.hardware.gnss@2.0-service-qti.xml
-else
 LOCAL_VINTF_FRAGMENTS := android.hardware.gnss@2.0-service-qti.xml
-endif
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_INIT_RC := android.hardware.gnss@2.0-service-qti.rc
diff --git a/android/2.0/legacy/android.hardware.gnss@2.0-service-qti.xml b/android/2.0/legacy/android.hardware.gnss@2.0-service-qti.xml
deleted file mode 100644
index 64344f7..0000000
--- a/android/2.0/legacy/android.hardware.gnss@2.0-service-qti.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Copyright (c) 2019, 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.
--->
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IGnss/default</fqname>
-        <fqname>@2.0::IGnss/default</fqname>
-    </hal>
-</manifest>
-
-- 
cgit v1.2.3