exynos9610: fix wifi hotspot

Change-Id: Ie8542357cc8418dc98d4559b9417e5b16d2af421

diff --git a/common.mk b/common.mk
index 52deb3ce271bf3c86a7dffd7b116e454206bf9cd..73280d4eca021c35e3872805f8bf51e543cde550 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -339,13 +339,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \
     hostapd \
-    wificond \
-    wifilogd \
-    wlutil \
-    libwpa_client \
     wpa_supplicant \
-    wpa_supplicant.conf \
+    wpa_supplicant.conf
 
 PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \
-    $(COMMON_PATH)/configs/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf
+    $(COMMON_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+    $(COMMON_PATH)/configs/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
+    $(COMMON_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf

diff --git a/configs/init/init.exynos9610.rc b/configs/init/init.exynos9610.rc
index 9fbfe484ba0b8d27c8478193c8754325458697de..58d5b70f14d832a463962d0b8d05b5f8c29baa91 100644 (file)
--- a/configs/init/init.exynos9610.rc
+++ b/configs/init/init.exynos9610.rc
@@ -498,23 +498,16 @@ on property:ro.boot.wifimacaddr=*
     write /sys/module/scsc_wlan/parameters/mac_addr_override ${ro.boot.wifimacaddr}
 
 # WiFi wpa suppplicant service
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant -ddd -t \
-    -ip2p0  -Dnl80211 -c/vendor/etc/wifi/p2p_supplicant.conf -N \
-    -iwlan0 -Dnl80211 -c/vendor/etc/wifi/wpa_supplicant.conf \
-    -O/data/vendor/wifi/wpa/sockets \
-    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
-    #   we will start as root and wpa_supplicant will switch to user wifi
-    #   after setting up the capabilities required for WEXT
-    #   user wifi
-    #   group wifi inet keystore
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
+    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
+    -g@android:wpa_wlan0
+    class main
     interface android.hardware.wifi.supplicant@1.0::ISupplicant default
     interface android.hardware.wifi.supplicant@1.1::ISupplicant default
     interface android.hardware.wifi.supplicant@1.2::ISupplicant default
-    class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
-    seclabel u:r:hal_wifi_supplicant_default:s0
 
 service dhcpcd_wlan0 /vendor/bin/dhcpcd -aABDKL
         class main

diff --git a/configs/wifi/p2p_supplicant.conf b/configs/wifi/p2p_supplicant.conf
deleted file mode 100644 (file)
index 4868606..0000000
--- a/configs/wifi/p2p_supplicant.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-update_config=1
-ctrl_interface=/data/vendor/wifi/wpa/sockets
-config_methods=physical_display virtual_push_button keypad
-eapol_version=1
-ap_scan=1
-fast_reauth=1
-p2p_add_cli_chan=1

diff --git a/configs/wifi/p2p_supplicant_overlay.conf b/configs/wifi/p2p_supplicant_overlay.conf
new file mode 100644 (file)
index 0000000..717ff99
--- /dev/null
+++ b/configs/wifi/p2p_supplicant_overlay.conf
@@ -0,0 +1,2 @@
+disable_scan_offload=1
+update_config=1

diff --git a/configs/wifi/wpa_supplicant.conf b/configs/wifi/wpa_supplicant.conf
index 459e107e614928ce473c511c207ac932ed553785..618672f915279f156aaeb53b93c9b1c2a415ab24 100644 (file)
--- a/configs/wifi/wpa_supplicant.conf
+++ b/configs/wifi/wpa_supplicant.conf
@@ -9,3 +9,4 @@ p2p_oper_reg_class=124
 p2p_oper_channel=149
 pmf=1
 bss_no_flush_when_down=1
+p2p_add_cli_chan=1

diff --git a/configs/wifi/wpa_supplicant_overlay.conf b/configs/wifi/wpa_supplicant_overlay.conf
new file mode 100644 (file)
index 0000000..eeb542a
--- /dev/null
+++ b/configs/wifi/wpa_supplicant_overlay.conf
@@ -0,0 +1,4 @@
+p2p_no_group_iface=1
+p2p_disabled=1
+update_config=1
+pmf=1

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index de5d892c95d70a274769b3c0bec5b6421fbfcb2f..82eab196a6cd7b52a0ae3913684f74a4e0a17ac4 100644 (file)
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -195,11 +195,13 @@
         <item>bt-pan</item>
     </array>
     <array name="config_tether_usb_regexs">
-        <item>rndis0</item>
-    </array>
-    <array name="config_tether_wifi_regexs">
-        <item>wlan0</item>
+        <item>"usb\\d"</item>
+        <item>"rndis\\d"</item>
     </array>
+    <string-array translatable="false" name="config_tether_wifi_regexs">
+        <item>"wlan0"</item>
+        <item>"softap.*"</item>
+    </string-array>
     <array name="config_virtualKeyVibePattern">
         <item>@null</item>
         <item>26</item>
@@ -218,7 +220,7 @@
     <bool name="config_wifi_dual_band_support">true</bool>
     <bool name="config_wifi_fast_bss_transition_enabled">true</bool>
     <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>
-    <bool name="config_wifi_softap_acs_supported">true</bool>
+    <bool name="config_wifi_softap_acs_supported">false</bool>
     <bool name="skip_restoring_network_selection">true</bool>
 
     <integer name="config_cameraLaunchGestureSensorType">65540</integer>
@@ -232,4 +234,7 @@
     <string name="config_ims_package">com.shannon.imsservice</string>
     <string name="config_radio_access_family">GSM|CDMA|EVDO|WCDMA|LTE</string>
     <string name="config_wifi_tcp_buffers">2097152,4194304,8388608,2097152,4194304,8388608</string>
+
+    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
+    <bool name="config_enableWifiDisplay">true</bool>
 </resources>

diff --git a/system.prop b/system.prop
index 4dd6867c4d0a3447b2a8b8edf3a9e1f3448233b2..64086df4585cbf38204a09774b73ec021f3641b8 100644 (file)
--- a/system.prop
+++ b/system.prop
@@ -10,3 +10,5 @@ ro.crypto.allow_encrypt_override=true
 ro.surface_flinger.use_color_management=1
 media.settings.xml=/vendor/etc/media_profiles_vendor.xml
 persist.audio.endcall.delay=250
+wifi.direct.interface=p2p0
+ro.boot.wificountrycode=00