From e8a089f7e02c7be33bb166a5e4c7a50a38e80569 Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Thu, 25 Aug 2022 14:29:10 +0200 Subject: [PATCH] universal7885: Switch to AIDL usb HAL Change-Id: I710ddcb6128ae3056083291d5dde66c294a1d018 --- a20/device.mk | 2 +- a20e/device.mk | 2 +- a30/device.mk | 2 +- a30s/device.mk | 2 +- a40/device.mk | 2 +- universal7885-common/sepolicy/vendor/file_contexts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/a20/device.mk b/a20/device.mk index b076a4a..de7b6f6 100644 --- a/a20/device.mk +++ b/a20/device.mk @@ -14,7 +14,7 @@ DERP_BUILDTYPE := Official # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.3-service.samsung + android.hardware.usb-service.samsung TARGET_SCREEN_HEIGHT := 1560 TARGET_SCREEN_WIDTH := 720 diff --git a/a20e/device.mk b/a20e/device.mk index eadf11a..0860436 100644 --- a/a20e/device.mk +++ b/a20e/device.mk @@ -14,7 +14,7 @@ DERP_BUILDTYPE := Official # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.3-service.samsung + android.hardware.usb-service.samsung TARGET_SCREEN_HEIGHT := 1560 TARGET_SCREEN_WIDTH := 720 diff --git a/a30/device.mk b/a30/device.mk index bd8588a..0828a9a 100644 --- a/a30/device.mk +++ b/a30/device.mk @@ -14,7 +14,7 @@ TARGET_SCREEN_WIDTH := 1080 # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.3-service.samsung + android.hardware.usb-service.samsung # Feature Permissions PRODUCT_COPY_FILES += \ diff --git a/a30s/device.mk b/a30s/device.mk index 9d34b4a..732c6d0 100644 --- a/a30s/device.mk +++ b/a30s/device.mk @@ -11,7 +11,7 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk) # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.3-service.samsung + android.hardware.usb-service.samsung TARGET_SCREEN_HEIGHT := 2280 TARGET_SCREEN_WIDTH := 1080 diff --git a/a40/device.mk b/a40/device.mk index 119ba16..6828027 100644 --- a/a40/device.mk +++ b/a40/device.mk @@ -11,7 +11,7 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk) # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.3-service.samsung + android.hardware.usb-service.samsung TARGET_SCREEN_HEIGHT := 2280 TARGET_SCREEN_WIDTH := 1080 diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts index 176932c..bdb2541 100644 --- a/universal7885-common/sepolicy/vendor/file_contexts +++ b/universal7885-common/sepolicy/vendor/file_contexts @@ -209,7 +209,7 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@[0-9]\.[0-9]-service\.widevine u:object_r:hal_drm_widevine_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@[0-9]\.[0-9]-service\.samsung u:object_r:hal_keymaster_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@[0-9]\.[0-9]-service\.samsung u:object_r:hal_nfc_default_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.samsung u:object_r:hal_usb_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.usb(@[0-9]\.[0-9])?-service\.samsung u:object_r:hal_usb_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@[0-9]\.[0-9]-service\.exynos7885 u:object_r:hal_camera_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.a10 u:object_r:hal_usb_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.gnss@[0-9]\.[0-9]-service u:object_r:hal_gnss_default_exec:s0