Fix decrypt and bootctl for Android O

dongseok1985 · Oct 6, 2017 · 6cabca4 · 6cabca4
1 parent 387e7f8
commit 6cabca4
Show file tree

Hide file tree

Showing 124 changed files with 87 additions and 45 deletions.
diff --git a/sepolicy/adsprpcd.te → NOsepolicy/adsprpcd.te b/sepolicy/adsprpcd.te → NOsepolicy/adsprpcd.te
diff --git a/sepolicy/app.te → NOsepolicy/app.te b/sepolicy/app.te → NOsepolicy/app.te
diff --git a/sepolicy/atfwd.te → NOsepolicy/atfwd.te b/sepolicy/atfwd.te → NOsepolicy/atfwd.te
diff --git a/sepolicy/audioserver.te → NOsepolicy/audioserver.te b/sepolicy/audioserver.te → NOsepolicy/audioserver.te
diff --git a/sepolicy/camera.te → NOsepolicy/camera.te b/sepolicy/camera.te → NOsepolicy/camera.te
diff --git a/sepolicy/cameraserver.te → NOsepolicy/cameraserver.te b/sepolicy/cameraserver.te → NOsepolicy/cameraserver.te
diff --git a/sepolicy/certs/app.x509.pem → NOsepolicy/certs/app.x509.pem b/sepolicy/certs/app.x509.pem → NOsepolicy/certs/app.x509.pem
diff --git a/sepolicy/cnd.te → NOsepolicy/cnd.te b/sepolicy/cnd.te → NOsepolicy/cnd.te
diff --git a/sepolicy/cnss-daemon.te → NOsepolicy/cnss-daemon.te b/sepolicy/cnss-daemon.te → NOsepolicy/cnss-daemon.te
diff --git a/sepolicy/cnss_diag.te → NOsepolicy/cnss_diag.te b/sepolicy/cnss_diag.te → NOsepolicy/cnss_diag.te
diff --git a/sepolicy/device.te → NOsepolicy/device.te b/sepolicy/device.te → NOsepolicy/device.te
diff --git a/sepolicy/dnsmasq.te → NOsepolicy/dnsmasq.te b/sepolicy/dnsmasq.te → NOsepolicy/dnsmasq.te
diff --git a/sepolicy/domain.te → NOsepolicy/domain.te b/sepolicy/domain.te → NOsepolicy/domain.te
diff --git a/sepolicy/dumpstate.te → NOsepolicy/dumpstate.te b/sepolicy/dumpstate.te → NOsepolicy/dumpstate.te
diff --git a/sepolicy/file.te → NOsepolicy/file.te b/sepolicy/file.te → NOsepolicy/file.te
diff --git a/sepolicy/file_contexts → NOsepolicy/file_contexts b/sepolicy/file_contexts → NOsepolicy/file_contexts
diff --git a/sepolicy/fingerprintd.te → NOsepolicy/fingerprintd.te b/sepolicy/fingerprintd.te → NOsepolicy/fingerprintd.te
diff --git a/sepolicy/genfs_contexts → NOsepolicy/genfs_contexts b/sepolicy/genfs_contexts → NOsepolicy/genfs_contexts
diff --git a/sepolicy/google_camera_app.te → NOsepolicy/google_camera_app.te b/sepolicy/google_camera_app.te → NOsepolicy/google_camera_app.te
diff --git a/sepolicy/hal_audio.te → NOsepolicy/hal_audio.te b/sepolicy/hal_audio.te → NOsepolicy/hal_audio.te
diff --git a/sepolicy/hal_bluetooth.te → NOsepolicy/hal_bluetooth.te b/sepolicy/hal_bluetooth.te → NOsepolicy/hal_bluetooth.te
diff --git a/sepolicy/hal_bootctl.te → NOsepolicy/hal_bootctl.te b/sepolicy/hal_bootctl.te → NOsepolicy/hal_bootctl.te
diff --git a/sepolicy/hal_camera.te → NOsepolicy/hal_camera.te b/sepolicy/hal_camera.te → NOsepolicy/hal_camera.te
diff --git a/sepolicy/hal_camera_default.te → NOsepolicy/hal_camera_default.te b/sepolicy/hal_camera_default.te → NOsepolicy/hal_camera_default.te
diff --git a/sepolicy/hal_contexthub.te → NOsepolicy/hal_contexthub.te b/sepolicy/hal_contexthub.te → NOsepolicy/hal_contexthub.te
diff --git a/sepolicy/hal_drm.te → NOsepolicy/hal_drm.te b/sepolicy/hal_drm.te → NOsepolicy/hal_drm.te
diff --git a/sepolicy/hal_drm_widevine.te → NOsepolicy/hal_drm_widevine.te b/sepolicy/hal_drm_widevine.te → NOsepolicy/hal_drm_widevine.te
diff --git a/sepolicy/hal_dumpstate_impl.te → NOsepolicy/hal_dumpstate_impl.te b/sepolicy/hal_dumpstate_impl.te → NOsepolicy/hal_dumpstate_impl.te
diff --git a/sepolicy/hal_fingerprint.te → NOsepolicy/hal_fingerprint.te b/sepolicy/hal_fingerprint.te → NOsepolicy/hal_fingerprint.te
diff --git a/sepolicy/hal_gnss.te → NOsepolicy/hal_gnss.te b/sepolicy/hal_gnss.te → NOsepolicy/hal_gnss.te
diff --git a/sepolicy/hal_gnss_defult.te → NOsepolicy/hal_gnss_defult.te b/sepolicy/hal_gnss_defult.te → NOsepolicy/hal_gnss_defult.te
diff --git a/sepolicy/hal_graphics_allocator.te → NOsepolicy/hal_graphics_allocator.te b/sepolicy/hal_graphics_allocator.te → NOsepolicy/hal_graphics_allocator.te
diff --git a/sepolicy/hal_graphics_composer_default.te → NOsepolicy/hal_graphics_composer_default.te b/sepolicy/hal_graphics_composer_default.te → NOsepolicy/hal_graphics_composer_default.te
diff --git a/sepolicy/hal_memtrack.te → NOsepolicy/hal_memtrack.te b/sepolicy/hal_memtrack.te → NOsepolicy/hal_memtrack.te
diff --git a/sepolicy/hal_power.te → NOsepolicy/hal_power.te b/sepolicy/hal_power.te → NOsepolicy/hal_power.te
diff --git a/sepolicy/hal_sensors.te → NOsepolicy/hal_sensors.te b/sepolicy/hal_sensors.te → NOsepolicy/hal_sensors.te
diff --git a/sepolicy/hal_thermal.te → NOsepolicy/hal_thermal.te b/sepolicy/hal_thermal.te → NOsepolicy/hal_thermal.te
diff --git a/sepolicy/hal_vr.te → NOsepolicy/hal_vr.te b/sepolicy/hal_vr.te → NOsepolicy/hal_vr.te
diff --git a/sepolicy/hal_wifi.te → NOsepolicy/hal_wifi.te b/sepolicy/hal_wifi.te → NOsepolicy/hal_wifi.te
diff --git a/sepolicy/hostapd.te → NOsepolicy/hostapd.te b/sepolicy/hostapd.te → NOsepolicy/hostapd.te
diff --git a/sepolicy/hrdump.te → NOsepolicy/hrdump.te b/sepolicy/hrdump.te → NOsepolicy/hrdump.te
diff --git a/sepolicy/ims.te → NOsepolicy/ims.te b/sepolicy/ims.te → NOsepolicy/ims.te
diff --git a/sepolicy/imscm.te → NOsepolicy/imscm.te b/sepolicy/imscm.te → NOsepolicy/imscm.te
diff --git a/sepolicy/init-devstart-sh.te → NOsepolicy/init-devstart-sh.te b/sepolicy/init-devstart-sh.te → NOsepolicy/init-devstart-sh.te
diff --git a/sepolicy/init-qseecomd-sh.te → NOsepolicy/init-qseecomd-sh.te b/sepolicy/init-qseecomd-sh.te → NOsepolicy/init-qseecomd-sh.te
diff --git a/sepolicy/init.te → NOsepolicy/init.te b/sepolicy/init.te → NOsepolicy/init.te
diff --git a/sepolicy/init_foreground.te → NOsepolicy/init_foreground.te b/sepolicy/init_foreground.te → NOsepolicy/init_foreground.te
diff --git a/sepolicy/init_mid.te → NOsepolicy/init_mid.te b/sepolicy/init_mid.te → NOsepolicy/init_mid.te
diff --git a/sepolicy/init_power.te → NOsepolicy/init_power.te b/sepolicy/init_power.te → NOsepolicy/init_power.te
diff --git a/sepolicy/init_radio.te → NOsepolicy/init_radio.te b/sepolicy/init_radio.te → NOsepolicy/init_radio.te
diff --git a/sepolicy/ioctl_defines → NOsepolicy/ioctl_defines b/sepolicy/ioctl_defines → NOsepolicy/ioctl_defines
diff --git a/sepolicy/ioctl_macros → NOsepolicy/ioctl_macros b/sepolicy/ioctl_macros → NOsepolicy/ioctl_macros
diff --git a/sepolicy/irqbalance.te → NOsepolicy/irqbalance.te b/sepolicy/irqbalance.te → NOsepolicy/irqbalance.te
diff --git a/sepolicy/irsc_util.te → NOsepolicy/irsc_util.te b/sepolicy/irsc_util.te → NOsepolicy/irsc_util.te
diff --git a/sepolicy/kernel.te → NOsepolicy/kernel.te b/sepolicy/kernel.te → NOsepolicy/kernel.te
diff --git a/sepolicy/keys.conf → NOsepolicy/keys.conf b/sepolicy/keys.conf → NOsepolicy/keys.conf
diff --git a/sepolicy/location.te → NOsepolicy/location.te b/sepolicy/location.te → NOsepolicy/location.te
diff --git a/sepolicy/mac_permissions.xml → NOsepolicy/mac_permissions.xml b/sepolicy/mac_permissions.xml → NOsepolicy/mac_permissions.xml
diff --git a/sepolicy/mediacodec.te → NOsepolicy/mediacodec.te b/sepolicy/mediacodec.te → NOsepolicy/mediacodec.te
diff --git a/sepolicy/mediaserver.te → NOsepolicy/mediaserver.te b/sepolicy/mediaserver.te → NOsepolicy/mediaserver.te
diff --git a/sepolicy/mm-pp-daemon.te → NOsepolicy/mm-pp-daemon.te b/sepolicy/mm-pp-daemon.te → NOsepolicy/mm-pp-daemon.te
diff --git a/sepolicy/nanoapp_cmd.te → NOsepolicy/nanoapp_cmd.te b/sepolicy/nanoapp_cmd.te → NOsepolicy/nanoapp_cmd.te
diff --git a/sepolicy/nanohub_slpi.te → NOsepolicy/nanohub_slpi.te b/sepolicy/nanohub_slpi.te → NOsepolicy/nanohub_slpi.te
diff --git a/sepolicy/net.te → NOsepolicy/net.te b/sepolicy/net.te → NOsepolicy/net.te
diff --git a/sepolicy/netd.te → NOsepolicy/netd.te b/sepolicy/netd.te → NOsepolicy/netd.te
diff --git a/sepolicy/netmgrd.te → NOsepolicy/netmgrd.te b/sepolicy/netmgrd.te → NOsepolicy/netmgrd.te
diff --git a/sepolicy/per_mgr.te → NOsepolicy/per_mgr.te b/sepolicy/per_mgr.te → NOsepolicy/per_mgr.te
diff --git a/sepolicy/per_proxy.te → NOsepolicy/per_proxy.te b/sepolicy/per_proxy.te → NOsepolicy/per_proxy.te
diff --git a/sepolicy/perfd.te → NOsepolicy/perfd.te b/sepolicy/perfd.te → NOsepolicy/perfd.te
diff --git a/sepolicy/platform_app.te → NOsepolicy/platform_app.te b/sepolicy/platform_app.te → NOsepolicy/platform_app.te
diff --git a/sepolicy/port-bridge.te → NOsepolicy/port-bridge.te b/sepolicy/port-bridge.te → NOsepolicy/port-bridge.te
diff --git a/sepolicy/ppp.te → NOsepolicy/ppp.te b/sepolicy/ppp.te → NOsepolicy/ppp.te
diff --git a/sepolicy/preloads_copy.te → NOsepolicy/preloads_copy.te b/sepolicy/preloads_copy.te → NOsepolicy/preloads_copy.te
diff --git a/sepolicy/priv_app.te → NOsepolicy/priv_app.te b/sepolicy/priv_app.te → NOsepolicy/priv_app.te
diff --git a/sepolicy/property.te → NOsepolicy/property.te b/sepolicy/property.te → NOsepolicy/property.te
diff --git a/sepolicy/property_contexts → NOsepolicy/property_contexts b/sepolicy/property_contexts → NOsepolicy/property_contexts
diff --git a/sepolicy/qmuxd.te → NOsepolicy/qmuxd.te b/sepolicy/qmuxd.te → NOsepolicy/qmuxd.te
diff --git a/sepolicy/qsee_logger.te → NOsepolicy/qsee_logger.te b/sepolicy/qsee_logger.te → NOsepolicy/qsee_logger.te
diff --git a/sepolicy/racoon.te → NOsepolicy/racoon.te b/sepolicy/racoon.te → NOsepolicy/racoon.te
diff --git a/sepolicy/radio.te → NOsepolicy/radio.te b/sepolicy/radio.te → NOsepolicy/radio.te
diff --git a/sepolicy/recovery.te → NOsepolicy/recovery.te b/sepolicy/recovery.te → NOsepolicy/recovery.te
diff --git a/sepolicy/rild.te → NOsepolicy/rild.te b/sepolicy/rild.te → NOsepolicy/rild.te
diff --git a/sepolicy/rmt.te → NOsepolicy/rmt.te b/sepolicy/rmt.te → NOsepolicy/rmt.te
diff --git a/sepolicy/seapp_contexts → NOsepolicy/seapp_contexts b/sepolicy/seapp_contexts → NOsepolicy/seapp_contexts
diff --git a/sepolicy/service.te → NOsepolicy/service.te b/sepolicy/service.te → NOsepolicy/service.te
diff --git a/sepolicy/service_contexts → NOsepolicy/service_contexts b/sepolicy/service_contexts → NOsepolicy/service_contexts
diff --git a/sepolicy/shell.te → NOsepolicy/shell.te b/sepolicy/shell.te → NOsepolicy/shell.te
diff --git a/sepolicy/smlog_dump.te → NOsepolicy/smlog_dump.te b/sepolicy/smlog_dump.te → NOsepolicy/smlog_dump.te
diff --git a/sepolicy/ssr_setup.te → NOsepolicy/ssr_setup.te b/sepolicy/ssr_setup.te → NOsepolicy/ssr_setup.te
diff --git a/sepolicy/subsystem_ramdump.te → NOsepolicy/subsystem_ramdump.te b/sepolicy/subsystem_ramdump.te → NOsepolicy/subsystem_ramdump.te
diff --git a/sepolicy/surfaceflinger.te → NOsepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te → NOsepolicy/surfaceflinger.te
diff --git a/sepolicy/system_app.te → NOsepolicy/system_app.te b/sepolicy/system_app.te → NOsepolicy/system_app.te
diff --git a/sepolicy/system_server.te → NOsepolicy/system_server.te b/sepolicy/system_server.te → NOsepolicy/system_server.te
diff --git a/sepolicy/te_macros → NOsepolicy/te_macros b/sepolicy/te_macros → NOsepolicy/te_macros
diff --git a/sepolicy/tee.te → NOsepolicy/tee.te b/sepolicy/tee.te → NOsepolicy/tee.te
diff --git a/sepolicy/thermal-engine.te → NOsepolicy/thermal-engine.te b/sepolicy/thermal-engine.te → NOsepolicy/thermal-engine.te
diff --git a/sepolicy/time.te → NOsepolicy/time.te b/sepolicy/time.te → NOsepolicy/time.te
diff --git a/sepolicy/ueventd.te → NOsepolicy/ueventd.te b/sepolicy/ueventd.te → NOsepolicy/ueventd.te
diff --git a/sepolicy/update_engine_common.te → NOsepolicy/update_engine_common.te b/sepolicy/update_engine_common.te → NOsepolicy/update_engine_common.te
diff --git a/sepolicy/verizon/keys.conf → NOsepolicy/verizon/keys.conf b/sepolicy/verizon/keys.conf → NOsepolicy/verizon/keys.conf
diff --git a/sepolicy/verizon/mac_permissions.xml → NOsepolicy/verizon/mac_permissions.xml b/sepolicy/verizon/mac_permissions.xml → NOsepolicy/verizon/mac_permissions.xml
diff --git a/sepolicy/verizon/obdm_app.te → NOsepolicy/verizon/obdm_app.te b/sepolicy/verizon/obdm_app.te → NOsepolicy/verizon/obdm_app.te
diff --git a/sepolicy/verizon/seapp_contexts → NOsepolicy/verizon/seapp_contexts b/sepolicy/verizon/seapp_contexts → NOsepolicy/verizon/seapp_contexts
diff --git a/sepolicy/verizon/verizon.x509.pem → NOsepolicy/verizon/verizon.x509.pem b/sepolicy/verizon/verizon.x509.pem → NOsepolicy/verizon/verizon.x509.pem
diff --git a/sepolicy/vold.te → NOsepolicy/vold.te b/sepolicy/vold.te → NOsepolicy/vold.te
diff --git a/sepolicy/wcnss_filter.te → NOsepolicy/wcnss_filter.te b/sepolicy/wcnss_filter.te → NOsepolicy/wcnss_filter.te
diff --git a/device-common.mk b/device-common.mk
@@ -32,9 +32,18 @@ PRODUCT_COPY_FILES += \
 DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay
 
 PRODUCT_COPY_FILES += \
-    device/google/marlin/recovery/root/sbin/bootctrl.msm8996.so:recovery/root/sbin/bootctrl.msm8996.so \
-    device/google/marlin/recovery/root/sbin/pulldecryptfiles.sh:recovery/root/sbin/pulldecryptfiles.sh \
-    device/google/marlin/recovery/root/sbin/qseecomd:recovery/root/sbin/qseecomd
+    device/google/marlin/recovery/root/odm/lib64/hw/bootctrl.msm8996.so:recovery/root/odm/lib64/hw/bootctrl.msm8996.so \
+    device/google/marlin/recovery/root/sbin/libdiag.so:recovery/root/sbin/libdiag.so \
+    device/google/marlin/recovery/root/sbin/libdrmfs.so:recovery/root/sbin/libdrmfs.so \
+    device/google/marlin/recovery/root/sbin/libdrmtime.so:recovery/root/sbin/libdrmtime.so \
+    device/google/marlin/recovery/root/sbin/libQSEEComAPI.so:recovery/root/sbin/libQSEEComAPI.so \
+    device/google/marlin/recovery/root/sbin/librpmb.so:recovery/root/sbin/librpmb.so \
+    device/google/marlin/recovery/root/sbin/libssd.so:recovery/root/sbin/libssd.so \
+    device/google/marlin/recovery/root/sbin/librecovery_updater_msm8996.so:recovery/root/sbin/librecovery_updater_msm8996.so \
+    device/google/marlin/recovery/root/odm/lib64/hw/gatekeeper.msm8996.so:recovery/root/odm/lib64/hw/gatekeeper.msm8996.so \
+    device/google/marlin/recovery/root/odm/lib64/hw/keystore.msm8996.so:recovery/root/odm/lib64/hw/keystore.msm8996.so \
+    device/google/marlin/recovery/root/sbin/qseecomd:recovery/root/sbin/qseecomd \
+    device/google/marlin/recovery/root/init.recovery.usb.rc:root/init.recovery.usb.rc
 
 # Input device files
 PRODUCT_COPY_FILES += \

diff --git a/init.recovery.common.rc b/init.recovery.common.rc
@@ -7,6 +7,7 @@ on fs
     chown system system /dev/ion
     start pulldecryptfiles
     install_keyring
+    setprop ro.hardware.bootctrl msm8996
 
 # separate copy needed to use /sbin/linker64 instead of /system/bin/linker64
 service sbinqseecomd /sbin/qseecomd
@@ -15,16 +16,5 @@ service sbinqseecomd /sbin/qseecomd
     group root
     seclabel u:r:recovery:s0
 
-service pulldecryptfiles /sbin/pulldecryptfiles.sh
-    oneshot
-    disabled
-    user root
-    group root
-    seclabel u:r:recovery:s0
-
 on boot
-    start pulldecryptfiles
     start sbinqseecomd
-
-#on property:ro.crypto.state=encrypted
-#    start sbinqseecomd
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
@@ -202,3 +202,4 @@ TW_DEFAULT_BRIGHTNESS := "80"
 TW_INCLUDE_CRYPTO := true
 AB_OTA_UPDATER := true
 TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_msm
+TW_EXCLUDE_DEFAULT_USB_INIT := true
diff --git a/recovery/root/sbin/bootctrl.msm8996.so → recovery/bootctrl.msm8996.old b/recovery/root/sbin/bootctrl.msm8996.so → recovery/bootctrl.msm8996.old
diff --git a/recovery/oem-recovery/oem-updater.cpp b/recovery/oem-recovery/oem-updater.cpp
@@ -41,7 +41,7 @@ Value* DecryptFn(const char* name, State* state, int argc, Expr* argv[]) {
     if (argc != 2)
         return ErrorAbort(state, "%s expects 2 args, got %d", name, argc);
 
-    if (ReadArgs(state, argv, 2, &src_file, &dst_file))
+    //if (ReadArgs(state, argv, 2, &src_file, &dst_file))
         return NULL;
 
     rc = decrypt_image(src_file, dst_file);
@@ -61,7 +61,7 @@ Value* BootUpdateFn(const char* name, State* state, int argc, Expr* argv[])
     if (argc != 1)
         return ErrorAbort(state, "%s() expects 1 args, got %d", name, argc);
 
-    if (ReadArgs(state, argv, 1, &stageStr))
+    //if (ReadArgs(state, argv, 1, &stageStr))
         return NULL;
 
     if (!strcmp(stageStr, "main"))
@@ -84,6 +84,6 @@ Value* BootUpdateFn(const char* name, State* state, int argc, Expr* argv[])
 }
 
 void Register_librecovery_updater_msm() {
-    RegisterFunction("msm.decrypt", DecryptFn);
-    RegisterFunction("msm.boot_update", BootUpdateFn);
+    //RegisterFunction("msm.decrypt", DecryptFn);
+    //RegisterFunction("msm.boot_update", BootUpdateFn);
 }
diff --git a/recovery/root/init.recovery.usb.rc b/recovery/root/init.recovery.usb.rc
@@ -0,0 +1,68 @@
+on init
+    write /sys/class/android_usb/android0/f_rndis/vendorID 18D1
+    write /sys/class/android_usb/android0/f_rndis/wceis 1
+
+on boot
+    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
+    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
+    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
+
+    write /sys/class/android_usb/f_mass_storage/lun/nofua 1
+
+    write /sys/class/android_usb/android0/f_rndis_qc/rndis_transports BAM2BAM_IPA
+    write /sys/module/g_android/parameters/mtp_tx_req_len 131072
+    write /sys/module/g_android/parameters/mtp_rx_req_len 131072
+    setprop sys.usb.ffs.max_write 524288
+    setprop sys.usb.ffs.max_read 524288
+    setprop sys.usb.mtp.device_type 3
+    setprop sys.usb.rps_mask 0
+
+    write /sys/class/android_usb/android0/f_ffs/aliases adb
+    mkdir /dev/usb-ffs 0775 shell shell
+    mkdir /dev/usb-ffs/adb 0770 shell shell
+    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+    mkdir /dev/usb-ffs/mtp 0770 mtp mtp
+    mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 18D1
+    write /sys/class/android_usb/android0/idProduct 4EE2
+    write /sys/class/android_usb/android0/bDeviceClass 0
+    write /sys/class/android_usb/android0/bDeviceSubClass 0
+    write /sys/class/android_usb/android0/bDeviceProtocol 0
+    write /sys/class/android_usb/android0/functions adb
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+
+on property:sys.usb.config=none
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/bDeviceClass 0
+
+on property:sys.usb.config=adb
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 18D1
+    write /sys/class/android_usb/android0/idProduct 4EE2
+    write /sys/class/android_usb/android0/bDeviceClass 0
+    write /sys/class/android_usb/android0/bDeviceSubClass 0
+    write /sys/class/android_usb/android0/bDeviceProtocol 0
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+    setprop sys.usb.state ${sys.usb.config}
+
+on property:sys.usb.config=mtp,adb
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 18D1
+    write /sys/class/android_usb/android0/idProduct 4EE2
+    write /sys/class/android_usb/android0/bDeviceClass 0
+    write /sys/class/android_usb/android0/bDeviceSubClass 0
+    write /sys/class/android_usb/android0/bDeviceProtocol 0
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+    setprop sys.usb.state ${sys.usb.config}
+
+on property:sys.usb.config=adb
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
+    write /sys/class/android_usb/android0/enable ${service.adb.root}
+    start adbd
diff --git a/recovery/root/odm/lib64/hw/bootctrl.msm8996.so b/recovery/root/odm/lib64/hw/bootctrl.msm8996.so
diff --git a/recovery/root/odm/lib64/hw/gatekeeper.msm8996.so b/recovery/root/odm/lib64/hw/gatekeeper.msm8996.so
diff --git a/recovery/root/odm/lib64/hw/keystore.msm8996.so b/recovery/root/odm/lib64/hw/keystore.msm8996.so
diff --git a/recovery/root/sbin/libQSEEComAPI.so b/recovery/root/sbin/libQSEEComAPI.so
diff --git a/recovery/root/sbin/libdiag.so b/recovery/root/sbin/libdiag.so
diff --git a/recovery/root/sbin/libdrmfs.so b/recovery/root/sbin/libdrmfs.so
diff --git a/recovery/root/sbin/libdrmtime.so b/recovery/root/sbin/libdrmtime.so
diff --git a/recovery/root/sbin/librecovery_updater_msm8996.so b/recovery/root/sbin/librecovery_updater_msm8996.so
diff --git a/recovery/root/sbin/librpmb.so b/recovery/root/sbin/librpmb.so
diff --git a/recovery/root/sbin/libssd.so b/recovery/root/sbin/libssd.so
diff --git a/recovery/root/sbin/pulldecryptfiles.sh b/recovery/root/sbin/pulldecryptfiles.sh
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
@@ -198,3 +198,4 @@ TW_DEFAULT_BRIGHTNESS := "80"
 TW_INCLUDE_CRYPTO := true
 AB_OTA_UPDATER := true
 TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_msm
+TW_EXCLUDE_DEFAULT_USB_INIT := true