Merge "usb: change the usb_gadget_hal permission to system" into tm-dev am: cdca2f8cc3

Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/18630148

Change-Id: I84359f6bbfa1beb01d779efa0bc48ac248394358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 65 insertions, 2 deletions

diff --git a/init.hardware.usb.rc b/init.hardware.usb.rc
index 0c542407..3551c32d 100644
--- a/init.hardware.usb.rc
+++ b/init.hardware.usb.rc
@@ -55,6 +55,69 @@ on early-boot
     write /sys/module/libcomposite/parameters/disable_l1_for_hs "y"
     write /config/usb_gadget/g1/functions/gsi.rndis/rndis_class_id 1
 
+    # chown file/folder permission
+    chown system system /config/usb_gadget/
+    chown system system /config/usb_gadget/g1
+    chown system system /config/usb_gadget/g1/UDC
+    chown system system /config/usb_gadget/g1/bDeviceClass
+    chown system system /config/usb_gadget/g1/bDeviceProtocol
+    chown system system /config/usb_gadget/g1/bDeviceSubClass
+    chown system system /config/usb_gadget/g1/bMaxPacketSize0
+    chown system system /config/usb_gadget/g1/bcdDevice
+    chown system system /config/usb_gadget/g1/bcdUSB
+    chown system system /config/usb_gadget/g1/configs
+    chown system system /config/usb_gadget/g1/configs/b.1
+    chown system system /config/usb_gadget/g1/configs/b.1/MaxPower
+    chown system system /config/usb_gadget/g1/configs/b.1/bmAttributes
+    chown system system /config/usb_gadget/g1/configs/b.1/strings
+    chown system system /config/usb_gadget/g1/functions
+    chown system system /config/usb_gadget/g1/functions/accessory.gs2
+    chown system system /config/usb_gadget/g1/functions/audio_source.gs3
+    chown system system /config/usb_gadget/g1/functions/cser.dun.0
+    chown system system /config/usb_gadget/g1/functions/cser.dun.0/status
+    chown system system /config/usb_gadget/g1/functions/cser.nmea.1
+    chown system system /config/usb_gadget/g1/functions/cser.nmea.1/status
+    chown system system /config/usb_gadget/g1/functions/diag.diag
+    chown system system /config/usb_gadget/g1/functions/diag.diag_mdm
+    chown system system /config/usb_gadget/g1/functions/ffs.adb
+    chown system system /config/usb_gadget/g1/functions/ffs.mtp
+    chown system system /config/usb_gadget/g1/functions/ffs.ptp
+    chown system system /config/usb_gadget/g1/functions/gsi.dpl
+    chown system system /config/usb_gadget/g1/functions/gsi.dpl/info
+    chown system system /config/usb_gadget/g1/functions/gsi.rmnet
+    chown system system /config/usb_gadget/g1/functions/gsi.rmnet/info
+    chown system system /config/usb_gadget/g1/functions/gsi.rndis
+    chown system system /config/usb_gadget/g1/functions/gsi.rndis/info
+    chown system system /config/usb_gadget/g1/functions/gsi.rndis/rndis_class_id
+    chown system system /config/usb_gadget/g1/functions/midi.gs5
+    chown system system /config/usb_gadget/g1/functions/midi.gs5/buflen
+    chown system system /config/usb_gadget/g1/functions/midi.gs5/id
+    chown system system /config/usb_gadget/g1/functions/midi.gs5/in_ports
+    chown system system /config/usb_gadget/g1/functions/midi.gs5/index
+    chown system system /config/usb_gadget/g1/functions/midi.gs5/out_ports
+    chown system system /config/usb_gadget/g1/functions/midi.gs5/qlen
+    chown system system /config/usb_gadget/g1/functions/qdss.qdss
+    chown system system /config/usb_gadget/g1/functions/qdss.qdss/enable_debug_inface
+    chown system system /config/usb_gadget/g1/functions/qdss.qdss_mdm
+    chown system system /config/usb_gadget/g1/functions/qdss.qdss_mdm/enable_debug_inface
+    chown system system /config/usb_gadget/g1/idProduct
+    chown system system /config/usb_gadget/g1/idVendor
+    chown system system /config/usb_gadget/g1/os_desc
+    chown system system /config/usb_gadget/g1/os_desc/b.1
+    chown system system /config/usb_gadget/g1/os_desc/b.1/MaxPower
+    chown system system /config/usb_gadget/g1/os_desc/b.1/bmAttributes
+    chown system system /config/usb_gadget/g1/os_desc/b.1/strings
+    chown system system /config/usb_gadget/g1/os_desc/b.1/strings/0x409
+    chown system system /config/usb_gadget/g1/os_desc/b.1/strings/0x409/configuration
+    chown system system /config/usb_gadget/g1/os_desc/b_vendor_code
+    chown system system /config/usb_gadget/g1/os_desc/qw_sign
+    chown system system /config/usb_gadget/g1/os_desc/use
+    chown system system /config/usb_gadget/g1/strings
+    chown system system /config/usb_gadget/g1/strings/0x409
+    chown system system /config/usb_gadget/g1/strings/0x409/manufacturer
+    chown system system /config/usb_gadget/g1/strings/0x409/product
+    chown system system /config/usb_gadget/g1/strings/0x409/serialnumber
+
 on property:init.svc.console=running
     write /sys/class/power_supply/usb/moisture_detection_enabled 0
 
diff --git a/usb/gadget/android.hardware.usb.gadget-service.sunfish.rc b/usb/gadget/android.hardware.usb.gadget-service.sunfish.rc
index 7e4c4697..4b85a8b5 100644
--- a/usb/gadget/android.hardware.usb.gadget-service.sunfish.rc
+++ b/usb/gadget/android.hardware.usb.gadget-service.sunfish.rc
@@ -1,7 +1,7 @@
 service vendor.usb-gadget-hal-1-1 /vendor/bin/hw/android.hardware.usb.gadget-service.sunfish
     class hal
-    user root
-    group root system shell mtp
+    user system
+    group system shell mtp
 
 on boot
     chown root system /sys/class/typec/port0/power_role