From 1cf73d398df6e0a774ef152d2437193fac555802 Mon Sep 17 00:00:00 2001
From: Peter Qiu <zqiu@google.com>
Date: Fri, 5 May 2017 14:00:40 -0700
Subject: msm8996-common: Use hardware feature definition to indicate Passpoint
 support

Bug: 36886243
Test: Manual test
Change-Id: I570f7037abfd670e153c62a8dc723f1e89e9bf56
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 msm8996.mk                                             | 1 +
 overlay/frameworks/base/core/res/res/values/config.xml | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/msm8996.mk b/msm8996.mk
index b366746..25dc676 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -65,6 +65,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
     frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
     frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml \
+    frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:system/etc/permissions/android.hardware.wifi.passpoint.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index bf8dfe1..f69581d 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -278,9 +278,6 @@
     <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
     <bool translatable="false" name="config_wifi_dual_band_support">true</bool>
 
-    <!-- Boolean indicating whether Hotspot 2.0/Passpoint and ANQP queries is enabled -->
-    <bool translatable="false" name="config_wifi_hotspot2_enabled">true</bool>
-
     <!-- Boolean indicating whether the wifi chipset has background scan support -->
     <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
 
-- 
cgit v1.2.3