diff options
| author | Roshan Pius <rpius@google.com> | 2016-12-14 21:39:46 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2016-12-15 15:38:41 +0000 |
| commit | f24b9c3edcd15a809c1bbf95cf2292c602a276da (patch) | |
| tree | 764a6244fee6d537bd0622b3818a27f795d0003a | |
| parent | ff99ab9b58813fc74180c34d6ea08a749b0ef99f (diff) | |
| parent | d11d2cff8964fc9a8190dda10413c577eea2c2b4 (diff) | |
| download | bullhead-f24b9c3edcd15a809c1bbf95cf2292c602a276da.tar.gz | |
resolve merge conflicts of d11d2cf to master
Change-Id: I12348192c9bfd994041cdeded5a2f5fde390f6a2
| -rw-r--r-- | device.mk | 1 | ||||
| -rw-r--r-- | init.bullhead.rc | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -255,6 +255,7 @@ PRODUCT_PACKAGES += \ # Wi-Fi PRODUCT_PACKAGES += \ + android.hardware.wifi@1.0-service \ libwpa_client \ hostapd \ wificond \ diff --git a/init.bullhead.rc b/init.bullhead.rc index 4676d4c..fec73a3 100644 --- a/init.bullhead.rc +++ b/init.bullhead.rc @@ -180,6 +180,9 @@ on boot chown system system /sys/class/leds/blue/on_off_ms chown system system /sys/class/leds/red/rgb_start + # Wifi firmware reload path + chown wifi wifi /sys/module/wlan/parameters/fwpath + on post-fs symlink /dev/block/platform/soc.0/f9824900.sdhci /dev/block/bootdevice |