From cc10db6dbdeb107e3b6621bcbb0a43610ed7edec Mon Sep 17 00:00:00 2001 From: bengris32 Date: Fri, 28 Oct 2022 20:06:47 +0100 Subject: [PATCH] rosemary: Ensure nonblocking ffs is disabled everywhere * Move the persist.adb.nonblocking_ffs property into PRODUCT_DEFAULT_PROPERTY_OVERRIDES to ensure its set everywhere. Signed-off-by: bengris32 Change-Id: I543194ffd3a87dc4ff3093cb6919c194e501ffa2 --- device.mk | 3 ++- recovery/root/init.recovery.mt6785.rc | 1 - rootdir/etc/init.mt6785.usb.rc | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 521536e..930a871 100644 --- a/device.mk +++ b/device.mk @@ -166,7 +166,8 @@ PRODUCT_PACKAGES += \ android.hardware.usb@1.0-service.basic PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - ro.adb.nonblocking_ffs=0 + ro.adb.nonblocking_ffs=0 \ + persist.adb.nonblocking_ffs=0 # Vibrator PRODUCT_PACKAGES += \ diff --git a/recovery/root/init.recovery.mt6785.rc b/recovery/root/init.recovery.mt6785.rc index 21ad769..bd76096 100644 --- a/recovery/root/init.recovery.mt6785.rc +++ b/recovery/root/init.recovery.mt6785.rc @@ -1,4 +1,3 @@ on init setprop sys.usb.ffs.aio_compat 1 setprop sys.usb.configfs 1 - setprop persist.adb.nonblocking_ffs 0 diff --git a/rootdir/etc/init.mt6785.usb.rc b/rootdir/etc/init.mt6785.usb.rc index dd39f08..7343e0e 100644 --- a/rootdir/etc/init.mt6785.usb.rc +++ b/rootdir/etc/init.mt6785.usb.rc @@ -42,7 +42,6 @@ on post-fs on boot setprop sys.usb.configfs 1 setprop sys.usb.ffs.aio_compat 1 - setprop persist.adb.nonblocking_ffs 0 setprop vendor.usb.controller "musb-hdrc" setprop vendor.usb.acm_cnt 0 setprop vendor.usb.acm_port0 ""