From d27ff5af874ab0c627a2bf4007a4866a02364016 Mon Sep 17 00:00:00 2001
From: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
Date: Thu, 30 Aug 2018 22:10:46 +0000
Subject: am57xevm: Remove WiFi feature

This patch removes all wifi configuration parameters.
Fixes monkeytest wifi-related nullpointer dereferences.

Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
---
 compatibility_matrix.xml                           |  8 -------
 device.mk                                          | 25 -------------------
 init.am57xevmboard.rc                              | 20 ----------------
 .../frameworks/base/core/res/res/values/config.xml | 28 +---------------------
 4 files changed, 1 insertion(+), 80 deletions(-)

diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index 659b8d3..e45aa9f 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -47,12 +47,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
-        <name>android.system.wifi.keystore</name>
-        <version>1.0</version>
-        <interface>
-            <name>IKeystore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </compatibility-matrix>
diff --git a/device.mk b/device.mk
index caa2474..772375d 100644
--- a/device.mk
+++ b/device.mk
@@ -40,31 +40,6 @@ PRODUCT_PACKAGES += vndk_package
 PRODUCT_PACKAGES += \
 	libunwind
 
-# Wi-Fi
-PRODUCT_PACKAGES += \
-	android.hardware.wifi@1.0-service \
-	wificond \
-	wpa_supplicant \
-	wpa_supplicant.conf \
-	wpa_supplicant_overlay.conf \
-	libwpa_client \
-	hostapd \
-	hostapd.conf \
-	dhcpcd.conf \
-	wifical.sh \
-	TQS_D_1.7.ini \
-	TQS_D_1.7_127x.ini \
-	crda \
-	regulatory.bin \
-	wlconf \
-
-PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
-	frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
-
-PRODUCT_PROPERTY_OVERRIDES += \
-	wifi.interface=wlan0 \
-
 PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
 
 # USB
diff --git a/init.am57xevmboard.rc b/init.am57xevmboard.rc
index 144e1cd..66c3767 100644
--- a/init.am57xevmboard.rc
+++ b/init.am57xevmboard.rc
@@ -53,23 +53,3 @@ service pvrsrvinit /vendor/bin/pvrsrvctl --start
     user root
     group root
     oneshot
-
-service p2p_supplicant /vendor/bin/hw/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
-    -O/data/misc/wifi/sockets -pp2p_device=1\
-    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class late_start
-    disabled
-    oneshot
-
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
-    -O/data/misc/wifi/sockets \
-    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class late_start
-    disabled
-    oneshot
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 5515d1c..e469336 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -36,15 +36,13 @@
          Wifi interfaces.  If the device doesn't want to support tethering over Wifi this
          should be empty.  An example would be "softap.*" -->
     <string-array translatable="false" name="config_tether_wifi_regexs">
-        <item>"wlan\\d"</item>
     </string-array>
 
     <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
     <!-- [1,7,9] for TYPE_WIFI, TYPE_BLUETOOTH and TYPE_ETHERNET-->
    <integer-array translatable="false" name="config_tether_upstream_types">
-        <item>1</item>
         <item>9</item>
-    </integer-array>
+   </integer-array>
 
     <!-- This string array should be overridden by the device to present a list of network
          attributes.  This is used by the connectivity manager to decide which networks can coexist
@@ -56,7 +54,6 @@
          does not require auto-restore. -->
     <!-- the 6th element indicates boot-time dependency-met value. -->
     <string-array translatable="false" name="networkAttributes">
-        <item>"wifi,1,1,1,-1,true"</item>
         <item>"ethernet,9,9,0,-1,true"</item>
     </string-array>
 
@@ -66,18 +63,9 @@
     <!-- An Array of "[ConnectivityManager connectionType],
                       [# simultaneous connection types]"  -->
     <string-array translatable="false" name="radioAttributes">
-        <item>"1,1"</item>
         <item>"9,1"</item>
     </string-array>
 
-    <!-- Integer indicating the framework scan interval in milliseconds. This is used in the scenario
-         where the chipset does not support background scanning (config_wifi_background_scan_suport
-         is false) to set up a periodic wake up scan so that the device can connect to a new access
-         point on the move. A value of 0 means no periodic scans will be used in the framework. -->
-    <integer translatable="false" name="config_wifi_framework_scan_interval">0</integer>
-
-    <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
-    <bool translatable="false" name="config_wifi_dual_band_support">true</bool>
 
     <!-- List of regexpressions describing the interface (if any) that represent tetherable
          bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
@@ -88,20 +76,6 @@
     <!-- Separate software navigation bar required on this device. -->
     <bool name="config_showNavigationBar">true</bool>
 
-    <!-- Whether WiFi display is supported by this device.
-         There are many prerequisites for this feature to work correctly.
-         Here are a few of them:
-         * The WiFi radio must support WiFi P2P.
-         * The WiFi radio must support concurrent connections to the WiFi display and
-           to an access point.
-         * The Audio Flinger audio_policy.conf file must specify a rule for the "r_submix"
-           remote submix module.  This module is used to record and stream system
-           audio output to the WiFi display encoder in the media server.
-         * The remote submix module "audio.r_submix.default" must be installed on the device.
-         * The device must be provisioned with HDCP keys (for protected content).
-    -->
-    <bool name="config_enableWifiDisplay">true</bool>
-
     <!-- Default list of files pinned by the Pinner Service -->
     <string-array translatable="false" name="config_defaultPinnerServiceFiles">
         <item>"/system/framework/arm/boot-framework.oat"</item>
-- 
cgit v1.2.3