poplar: Cumulative patch from commit 6d860e7

6d860e7 (origin/master, origin/HEAD) poplar: use vendor prebuilt wifi files
2de4ee5 wifi: add capabilities for wpa_supplicant
46ac944 poplar: create an optee folder for OP-TEE files
9411998 poplar: move hiavplayer.rc into vendor folder
e19a218 poplar: rename rootfs to vendor
fdb3113 BoardConfig.mk: add printk.devkmsg=on to BOARD_KERNEL_CMDLINE
da84bb1 init.poplar.rc: setprop service.adb.tcp.port 5555
ad56c8a Revert "WIP: temporarily disable bluetooth"
28e4d5e bt: add ro.boot.btmacaddr property and chmod of rtkbt_dev
363a2e4 wifi: enable wifi HAL support
958edb7 wifi: remove use of rtl8822bu module
fe5024d audio: add include of <unistd.h> to fix usleep warnings
6e36a97 device.mk: add Launcher2 package
4673aee WIP: temporarily disable bluetooth
8b6fdda poplar: remove obsolete self-extractors
b8b039f poplar: switch from add_lunch_combo to COMMON_LUNCH_CHOICES
acd1ef6 poplar: enable full treble support
d6df05c audio: update Android.mk for treble support
d9a9261 audio: include <log/log.h> instead of <cutils/log.h>
1f6821d device.mk: use TARGET_COPY_OUT_VENDOR for feature declarations
9b9a1a7 device.mk: clean up newlines and backslash
29db545 device.mk: build soundtrigger package for audio support
3d4498f device.mk: add ro.config.build.name property
fdb44d6 manifest: update manifest file for treble support
d0cc662 ueventd.poplar.rc: add hi_gfx2d device node back
ccc635e sepolicy: sync up selinux policy with Hisilicon development
2c391e5 sepoilcy: remove 'x' attribute from .te files
44c53b7 fstab.poplar: remove system and vendor mount
6b21fe2 fstab.poplar: use by-name symlinks instead of by-num
1e3bd67 poplar: add bt/wifi files and configurations
93bf7a1 device.mk: move BT section close to Wifi

Bug: 110793466
Test: Manual

Change-Id: If7db092bbed239ea83287fcf294b7d70c53e04b5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

3 files changed, 208 insertions, 0 deletions

diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant.conf
new file mode 100644
index 0000000..5f46ae5
--- /dev/null
+++ b/wifi/p2p_supplicant.conf
@@ -0,0 +1,79 @@
+# wpa_supplicant configuration file for p2p.
+
+# Parameters for the control interface. If this is specified, wpa_supplicant
+# will open a control interface that is available for external programs to
+# manage wpa_supplicant. The meaning of this string depends on which control
+# interface mechanism is used. For all cases, the existence of this parameter
+# in configuration is used to determine whether the control interface is
+# enabled.
+ctrl_interface=p2p0
+
+# Whether to allow wpa_supplicant to update (overwrite) configuration
+#
+# This option can be used to allow wpa_supplicant to overwrite configuration
+# file whenever configuration is changed (e.g., new network block is added with
+# wpa_cli or wpa_gui, or a password is changed). This is required for
+# wpa_cli/wpa_gui to be able to store the configuration changes permanently.
+# Please note that overwriting configuration file will remove the comments from
+# it.
+update_config=1
+
+# Wi-Fi Protected Setup (WPS) parameters
+
+# Device Name
+# User-friendly description of device; up to 32 octets encoded in UTF-8
+device_name=Android_5118
+
+# Manufacturer
+# The manufacturer of the device (up to 64 ASCII characters)
+manufacturer=Hisilicon
+
+# Model Name
+# Model of the device (up to 32 ASCII characters)
+#model_name=RTW_STA
+
+# Model Number
+# Additional device description (up to 32 ASCII characters)
+#model_number=WLAN_CU
+
+# Serial Number
+# Serial number of the device (up to 32 characters)
+#serial_number=12345
+
+# Primary Device Type
+# Used format: <categ>-<OUI>-<subcateg>
+# categ = Category as an integer value
+# OUI = OUI and type octet as a 4-octet hex-encoded value; 0050F204 for
+#       default WPS OUI
+# subcateg = OUI-specific Sub Category as an integer value
+# Examples:
+#   1-0050F204-1 (Computer / PC)
+#   1-0050F204-2 (Computer / Server)
+#   5-0050F204-1 (Storage / NAS)
+#   6-0050F204-1 (Network Infrastructure / AP)
+device_type=10-0050F204-5
+
+# OS Version
+# 4-octet operating system version number (hex string)
+#os_version=01020300
+
+# Config Methods
+# List of the supported configuration methods
+# Available methods: usba ethernet label display ext_nfc_token int_nfc_token
+#	nfc_interface push_button keypad virtual_display physical_display
+#	virtual_push_button physical_push_button
+# For WSC 1.0:
+#config_methods=display push_button keypad
+# For WSC 2.0:
+config_methods=virtual_display virtual_push_button
+
+# Listen channel
+p2p_listen_reg_class=81
+p2p_listen_channel=1
+
+# Operation channel
+p2p_oper_reg_class=81
+p2p_oper_channel=1
+
+# persisten reconnect
+persistent_reconnect=1
diff --git a/wifi/wifi.rc b/wifi/wifi.rc
new file mode 100644
index 0000000..be02764
--- /dev/null
+++ b/wifi/wifi.rc
@@ -0,0 +1,25 @@
+
+on boot
+    setprop wlan.driver.status ok
+
+on post-fs-data
+    # Create the directories used by the Wireless subsystem
+    mkdir /data/vendor/misc 0770 wifi wifi
+    mkdir /data/vendor/misc/wifi 0770 wifi wifi
+    mkdir /data/vendor/misc/wifi/sockets 0770 wifi wifi
+    mkdir /data/vendor/misc/dhcp 0770 dhcp system
+
+service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
+     -ip2p0 -Dnl80211 -c/vendor/etc/wifi/p2p_supplicant.conf \
+     -e/data/misc/wifi/entropy.bin -N \
+     -iwlan0 -Dnl80211 -c/vendor/etc/wifi/wpa_supplicant.conf \
+     -O/data/vendor/misc/wifi/sockets \
+     -g@android:wpa_wlan0
+     socket wpa_wlan0 dgram 660 wifi wifi
+     class main
+     user wifi
+     group wifi net_raw net_admin
+     capabilities NET_RAW NET_ADMIN
+     writepid /data/vendor/misc/wifi/wpa_supplicant.pid
+     disabled
+     oneshot
diff --git a/wifi/wpa_supplicant.conf b/wifi/wpa_supplicant.conf
new file mode 100644
index 0000000..ee24231
--- /dev/null
+++ b/wifi/wpa_supplicant.conf
@@ -0,0 +1,104 @@
+# wpa_supplicant configuration file.
+
+# Whether to allow wpa_supplicant to update (overwrite) configuration
+#
+# This option can be used to allow wpa_supplicant to overwrite configuration
+# file whenever configuration is changed (e.g., new network block is added with
+# wpa_cli or wpa_gui, or a password is changed). This is required for
+# wpa_cli/wpa_gui to be able to store the configuration changes permanently.
+# Please note that overwriting configuration file will remove the comments from
+# it.
+update_config=1
+
+# global configuration (shared by all network blocks)
+#
+# Parameters for the control interface. If this is specified, wpa_supplicant
+# will open a control interface that is available for external programs to
+# manage wpa_supplicant. The meaning of this string depends on which control
+# interface mechanism is used. For all cases, the existence of this parameter
+# in configuration is used to determine whether the control interface is
+# enabled.
+#
+# For UNIX domain sockets (default on Linux and BSD): This is a directory that
+# will be created for UNIX domain sockets for listening to requests from
+# external programs (CLI/GUI, etc.) for status information and configuration.
+# The socket file will be named based on the interface name, so multiple
+# wpa_supplicant processes can be run at the same time if more than one
+# interface is used.
+# /var/run/wpa_supplicant is the recommended directory for sockets and by
+# default, wpa_cli will use it when trying to connect with wpa_supplicant.
+#
+# Access control for the control interface can be configured by setting the
+# directory to allow only members of a group to use sockets. This way, it is
+# possible to run wpa_supplicant as root (since it needs to change network
+# configuration and open raw sockets) and still allow GUI/CLI components to be
+# run as non-root users. However, since the control interface can be used to
+# change the network configuration, this access needs to be protected in many
+# cases. By default, wpa_supplicant is configured to use gid 0 (root). If you
+# want to allow non-root users to use the control interface, add a new group
+# and change this value to match with that group. Add users that should have
+# control interface access to this group. If this variable is commented out or
+# not included in the configuration file, group will not be changed from the
+# value it got by default when the directory or socket was created.
+#
+# When configuring both the directory and group, use following format:
+# DIR=/var/run/wpa_supplicant GROUP=wheel
+# DIR=/var/run/wpa_supplicant GROUP=0
+# (group can be either group name or gid)
+#
+# For UDP connections (default on Windows): The value will be ignored. This
+# variable is just used to select that the control interface is to be created.
+# The value can be set to, e.g., udp (ctrl_interface=udp)
+#
+# For Windows Named Pipe: This value can be used to set the security descriptor
+# for controlling access to the control interface. Security descriptor can be
+# set using Security Descriptor String Format (see http://msdn.microsoft.com/
+# library/default.asp?url=/library/en-us/secauthz/security/
+# security_descriptor_string_format.asp). The descriptor string needs to be
+# prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty
+# DACL (which will reject all connections). See README-Windows.txt for more
+# information about SDDL string format.
+#
+ctrl_interface=wlan0
+
+# IEEE 802.1X/EAPOL version
+# wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines
+# EAPOL version 2. However, there are many APs that do not handle the new
+# version number correctly (they seem to drop the frames completely). In order
+# to make wpa_supplicant interoperate with these APs, the version number is set
+# to 1 by default. This configuration value can be used to set it to the new
+# version (2).
+eapol_version=1
+
+# AP scanning/selection
+# By default, wpa_supplicant requests driver to perform AP scanning and then
+# uses the scan results to select a suitable AP. Another alternative is to
+# allow the driver to take care of AP scanning and selection and use
+# wpa_supplicant just to process EAPOL frames based on IEEE 802.11 association
+# information from the driver.
+# 1: wpa_supplicant initiates scanning and AP selection; if no APs matching to
+#    the currently enabled networks are found, a new network (IBSS or AP mode
+#    operation) may be initialized (if configured) (default)
+# 0: driver takes care of scanning, AP selection, and IEEE 802.11 association
+#    parameters (e.g., WPA IE generation); this mode can also be used with
+#    non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
+#    APs (i.e., external program needs to control association). This mode must
+#    also be used when using wired Ethernet drivers.
+# 2: like 0, but associate with APs using security policy and SSID (but not
+#    BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to
+#    enable operation with hidden SSIDs and optimized roaming; in this mode,
+#    the network blocks in the configuration file are tried one by one until
+#    the driver reports successful association; each network block should have
+#    explicit security policy (i.e., only one option in the lists) for
+#    key_mgmt, pairwise, group, proto variables
+# When using IBSS or AP mode, ap_scan=2 mode can force the new network to be
+# created immediately regardless of scan results. ap_scan=1 mode will first try
+# to scan for existing networks and only if no matches with the enabled
+# networks are found, a new IBSS or AP mode network is created.
+ap_scan=1
+
+# EAP fast re-authentication
+# By default, fast re-authentication is enabled for all EAP methods that
+# support it. This variable can be used to disable fast re-authentication.
+# Normally, there is no need to disable this.
+fast_reauth=1