commit 5e2670e4bc20998d1e690a5cf1f99ba040907de1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 15 21:17:28 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 15 21:17:28 2017 +0000
tree 87486e5f5e2f43cd09279ca373a6336944a6b6ea
parent 17e1124421f655cef38b901016caa58fbbea467d
parent 7cc9c40ec2bf4a4fad77a366ec5aad901121d745

Merge "Bluetooth: Add death recipient"

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index c23f0b5..d4aa0da 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -25,6 +25,7 @@
 
 # Add wifi-related packages
 PRODUCT_PACKAGES += libwpa_client wpa_supplicant hostapd wificond wifilogd
+PRODUCT_PACKAGES += android.hardware.wifi@1.0-service
 PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \
                               wifi.supplicant_scan_interval=15
 

init.common.rc

diff --git a/init.common.rc b/init.common.rc
index 318ffc9..11bc675 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -66,10 +66,15 @@
     #
     # EAS stune boosting interfaces
     #
+    chown system system /dev/stune/top-app/schedtune.boost
+    chown system system /dev/stune/top-app/schedtune.prefer_idle
     chown system system /dev/stune/foreground/schedtune.boost
     chown system system /dev/stune/foreground/schedtune.prefer_idle
     chown system system /dev/stune/schedtune.boost
-    write /dev/stune/foreground/schedtune.boost 10
+
+    write /dev/stune/top-app/schedtune.boost 10
+    write /dev/stune/top-app/schedtune.prefer_idle 1
+    write /dev/stune/foreground/schedtune.boost 0
     write /dev/stune/foreground/schedtune.prefer_idle 1
     write /dev/stune/schedtune.boost 0
 
@@ -94,7 +99,7 @@
     group bluetooth net_bt_admin system
     oneshot
 
-service wpa_supplicant /system/bin/wpa_supplicant \
+service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
      -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
      -e/data/misc/wifi/entropy.bin  -g@android:wpa_wlan0
      socket wpa_wlan0 dgram 660 wifi wifi

power/Android.mk

diff --git a/power/Android.mk b/power/Android.mk
index 2c7e15f..187d56e 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -22,6 +22,6 @@
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_SRC_FILES := power_hikey.c
-LOCAL_MODULE := power.hikey
+LOCAL_MODULE := power.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)

power/power_hikey.c

diff --git a/power/power_hikey.c b/power/power_hikey.c
index e9a5248..d54eae9 100644
--- a/power/power_hikey.c
+++ b/power/power_hikey.c
@@ -36,7 +36,7 @@
 #include <hardware/hardware.h>
 #include <hardware/power.h>
 
-#define SCHEDTUNE_BOOST_PATH "/dev/stune/foreground/schedtune.boost"
+#define SCHEDTUNE_BOOST_PATH "/dev/stune/top-app/schedtune.boost"
 #define SCHEDTUNE_BOOST_NORM "10"
 #define SCHEDTUNE_BOOST_INTERACTIVE "40"
 #define SCHEDTUNE_BOOST_TIME_NS 1000000000LL