diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-05 07:27:53 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-05 07:27:53 +0000 |
commit | 37eac50c556bd63ff909a6bf1138068ea99eb72a (patch) | |
tree | 6ed7adcf4a1003140a6756dac10d4f12bd7eec5f | |
parent | a533a51ce7066163aab26a2eba99ce0bc7c47ea8 (diff) | |
parent | 06082c0a688d1db90686001a8047701b265f09ee (diff) | |
download | wahoo-37eac50c556bd63ff909a6bf1138068ea99eb72a.tar.gz |
Snap for 4378450 from 06082c0a688d1db90686001a8047701b265f09ee to oc-mr1-release
Change-Id: I4c52b937650667c72af39af0d94a1614ea6bd823
-rwxr-xr-x | init.insmod.sh | 6 | ||||
-rw-r--r-- | p2p_supplicant_overlay.conf | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/init.insmod.sh b/init.insmod.sh index d98037cf..46e9363b 100755 --- a/init.insmod.sh +++ b/init.insmod.sh @@ -7,7 +7,11 @@ ### ... ### ######################################### -cfg_file="/vendor/etc/init.insmod.cfg" +if [[ -e "/vendor/etc/init.insmod_charger.cfg" && "$(getprop ro.boot.mode)" == "charger" ]]; then + cfg_file="/vendor/etc/init.insmod_charger.cfg" +else + cfg_file="/vendor/etc/init.insmod.cfg" +fi if [ -f $cfg_file ]; then while IFS=" " read -r action name diff --git a/p2p_supplicant_overlay.conf b/p2p_supplicant_overlay.conf index acbace22..b5e89e03 100644 --- a/p2p_supplicant_overlay.conf +++ b/p2p_supplicant_overlay.conf @@ -1 +1,2 @@ disable_scan_offload=1 +p2p_no_group_iface=1 |