From 552f3b4b9c6764680e5a52b2b6a309f80b1f0299 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Mon, 22 Mar 2021 16:36:17 -0700
Subject: [PATCH] Copy vendor.sys.usb.adb.enabled to sys.usb.adb.enabled.

Bug: http://b/182088146
Test: manual
Change-Id: Ic20dd05813d834ad077f241929030f69906bf0bf
---
 rootdir/init.usb.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rootdir/init.usb.rc b/rootdir/init.usb.rc
index 27b05ec17..0730ccecf 100644
--- a/rootdir/init.usb.rc
+++ b/rootdir/init.usb.rc
@@ -19,6 +19,9 @@ service adbd /system/bin/adbd --root_seclabel=u:r:su:s0
     updatable
     seclabel u:r:adbd:s0
 
+on property:vendor.sys.usb.adb.disabled=*
+    setprop sys.usb.adb.disabled ${vendor.sys.usb.adb.disabled}
+
 # Set default value on sys.usb.configfs early in boot sequence. It will be
 # overridden in `on boot` action of init.hardware.rc.
 on init