Merge "Manta: NFC: Disable low-power tag detect." into jb-mr1-dev
diff --git a/init.manta.rc b/init.manta.rc
index 55c8092..7fcad65 100644
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -66,8 +66,10 @@
class late_start
service p2p_supplicant /system/bin/wpa_supplicant \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
- -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin -puse_p2p_group_interface=1
+ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+ -puse_multi_chan_concurrent=1 -N -ip2p0 -Dnl80211 \
+ -c/data/misc/wifi/p2p_supplicant.conf -puse_multi_chan_concurrent=1 \
+ -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
diff --git a/releasetools.py b/releasetools.py
index 7945797..833c013 100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -59,10 +59,13 @@
def WriteBootloader(info, bootloader_img):
common.ZipWriteStr(info.output_zip, "bootloader.img", bootloader_img)
+ common.ZipWriteStr(info.output_zip, "zero", "0")
bl_type, bl_device = common.GetTypeAndDevice("/bootloader", info.info_dict)
fstab = info.info_dict["fstab"]
info.script.Print("Writing bootloader...")
+ force_ro = "/sys/block/" + bl_device.split("/")[-1] + "/force_ro"
+ info.script.AppendExtra('package_extract_file("zero", "%s");' % (force_ro,))
info.script.AppendExtra('package_extract_file("bootloader.img", "%s");' %
bl_device)
