From 2719b51abc1b80d16b3ea6ff885c99984aa24d44 Mon Sep 17 00:00:00 2001 From: Arnab Chaudhuri Date: Fri, 25 Dec 2015 22:20:05 +0530 Subject: galaxys2-common: Update Wi-Fi configuration Change-Id: I83c0c08e06db8c9275047c9f4c7f6d8c87ec5a68 --- common.mk | 5 +++-- configs/p2p_supplicant_overlay.conf | 11 +++++++++++ configs/wpa_supplicant.conf | 13 ------------- configs/wpa_supplicant_overlay.conf | 4 ++++ rootdir/init.smdk4210.rc | 19 +++++++++---------- 5 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 configs/p2p_supplicant_overlay.conf delete mode 100644 configs/wpa_supplicant.conf create mode 100644 configs/wpa_supplicant_overlay.conf diff --git a/common.mk b/common.mk index 3ed779c..d35de14 100644 --- a/common.mk +++ b/common.mk @@ -39,12 +39,13 @@ PRODUCT_COPY_FILES += \ # Wifi PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \ + $(COMMON_PATH)/configs/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \ + $(COMMON_PATH)/configs/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \ $(COMMON_PATH)/configs/bcmdhd.cal:system/etc/wifi/bcmdhd.cal PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 \ - wifi.supplicant_scan_interval=15 \ + wifi.supplicant_scan_interval=30 \ net.tethering.noprovisioning=true $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk) diff --git a/configs/p2p_supplicant_overlay.conf b/configs/p2p_supplicant_overlay.conf new file mode 100644 index 0000000..1566988 --- /dev/null +++ b/configs/p2p_supplicant_overlay.conf @@ -0,0 +1,11 @@ +disable_scan_offload=1 +p2p_listen_reg_class=81 +p2p_listen_channel=1 +p2p_oper_reg_class=124 +p2p_oper_channel=149 +manufacturer=SAMSUNG_ELECTRONICS +model_name=SAMSUNG_MOBILE +model_number=2014 +serial_number=19691101 +update_config=1 +no_ctrl_interface= diff --git a/configs/wpa_supplicant.conf b/configs/wpa_supplicant.conf deleted file mode 100644 index 0e6a2e3..0000000 --- a/configs/wpa_supplicant.conf +++ /dev/null @@ -1,13 +0,0 @@ -update_config=1 -ctrl_interface=wlan0 -eapol_version=1 -ap_scan=1 -fast_reauth=1 -p2p_listen_reg_class=81 -p2p_listen_channel=1 -p2p_oper_reg_class=115 -p2p_oper_channel=48 -manufacturer=SAMSUNG_ELECTRONICS -model_name=SAMSUNG_MOBILE -model_number=2014 -serial_number=19691101 diff --git a/configs/wpa_supplicant_overlay.conf b/configs/wpa_supplicant_overlay.conf new file mode 100644 index 0000000..46504a2 --- /dev/null +++ b/configs/wpa_supplicant_overlay.conf @@ -0,0 +1,4 @@ +p2p_disabled=1 +autoscan=samsung_exponential:8:128 +update_config=1 +no_ctrl_interface= diff --git a/rootdir/init.smdk4210.rc b/rootdir/init.smdk4210.rc index b399584..acbdece 100644 --- a/rootdir/init.smdk4210.rc +++ b/rootdir/init.smdk4210.rc @@ -68,6 +68,7 @@ on post-fs-data mkdir /data/misc/wifi/sockets 0770 wifi wifi mkdir /data/misc/dhcp 0770 dhcp dhcp chown dhcp dhcp /data/misc/dhcp + chown wifi root /dev/rfkill #DRM directory creation mkdir /system/etc/security/.drm 0775 @@ -344,11 +345,11 @@ service charger /sbin/healthd -c service p2p_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ - -I/system/etc/wifi/wpa_supplicant.conf \ - -O/data/misc/wifi/sockets -N \ - -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf -N \ + -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \ + -I/system/etc/wifi/p2p_supplicant_overlay.conf \ -puse_p2p_group_interface=1 \ - -g@android:wpa_wlan0 + -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 @@ -359,11 +360,9 @@ service p2p_supplicant /system/bin/wpa_supplicant \ oneshot service wpa_supplicant /system/bin/wpa_supplicant \ - -Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \ - -c/data/misc/wifi/wpa_supplicant.conf \ - -I/system/etc/wifi/wpa_supplicant.conf \ - -O/data/misc/wifi/sockets \ - -g@android:wpa_wlan0 + -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -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 @@ -406,7 +405,7 @@ service iprenew_bt-pan /system/bin/dhcpcd -n service macloader /system/bin/macloader class main oneshot - + # bugreport is triggered by holding down volume down, volume up and power service bugreport /system/bin/dumpstate -d -p -B \ -o /data/data/com.android.shell/files/bugreports/bugreport -- cgit v1.1