From 80cdf445dff424928caf0afe9de74b427358b554 Mon Sep 17 00:00:00 2001 From: Jaekyun Seok Date: Wed, 30 Aug 2017 10:51:23 +0900 Subject: [PATCH] sanders: Add 'vendor.' prefix to a vendor HAL service name To prevent property name collisions between properties of system and vendor, 'vendor.' prefix must be added to a vendor HAL service name. You can see the details in http://go/treble-sysprop-compatibility. Test: succeeded building and tested on a sailfish device. Bug: 36796459 Change-Id: I48e6ee0ae3fe401e39efb273256d991fac676357 Signed-off-by: therootlord --- .../etc/init/android.hardware.bluetooth@1.0-service-qti.rc | 2 +- .../motorola.hardware.camera.provider@2.4-service_delayed.rc | 4 ++-- .../vendor/etc/init/vendor.display.color@1.0-service.rc | 2 +- .../vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc | 2 +- proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc | 2 +- .../vendor/etc/init/vendor.qti.hardware.iop@1.0-service.rc | 2 +- .../vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc | 2 +- .../init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc index 7d0a1c1..c46e688 100644 --- a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc +++ b/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc @@ -1,4 +1,4 @@ -service bluetooth-1-0 /system/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti +service vendor.bluetooth-1-0 /system/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti class hal user bluetooth group bluetooth system wakelock oem_2901 diff --git a/proprietary/vendor/etc/init/motorola.hardware.camera.provider@2.4-service_delayed.rc b/proprietary/vendor/etc/init/motorola.hardware.camera.provider@2.4-service_delayed.rc index 2cf8315..49e5e01 100644 --- a/proprietary/vendor/etc/init/motorola.hardware.camera.provider@2.4-service_delayed.rc +++ b/proprietary/vendor/etc/init/motorola.hardware.camera.provider@2.4-service_delayed.rc @@ -1,8 +1,8 @@ on property:persist.camera.daemon=1 - enable motcamera-provider-2-4 + enable vendor.motcamera-provider-2-4 setprop persist.camera.daemon 0 -service motcamera-provider-2-4 /vendor/bin/hw/motorola.hardware.camera.provider@2.4-service +service vendor.motcamera-provider-2-4 /vendor/bin/hw/motorola.hardware.camera.provider@2.4-service class hal user cameraserver group audio camera input drmrpc diff --git a/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc b/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc index 435344a..8d26446 100644 --- a/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc +++ b/proprietary/vendor/etc/init/vendor.display.color@1.0-service.rc @@ -1,4 +1,4 @@ -service display-color-hal-1-0 /vendor/bin/hw/vendor.display.color@1.0-service +service vendor.display-color-hal-1-0 /vendor/bin/hw/vendor.display.color@1.0-service class hal user system group system diff --git a/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc index 09095dc..1cc50f9 100644 --- a/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc +++ b/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.0-service.rc @@ -1,4 +1,4 @@ -service qti_esepowermanager_service /vendor/bin/hw/vendor.qti.esepowermanager@1.0-service +service vendor.qti_esepowermanager_service /vendor/bin/hw/vendor.qti.esepowermanager@1.0-service class hal user system group nfc diff --git a/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc index 4643dfc..7f43702 100644 --- a/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc +++ b/proprietary/vendor/etc/init/vendor.qti.gnss@1.0-service.rc @@ -1,4 +1,4 @@ -service qti_gnss_service /vendor/bin/hw/vendor.qti.gnss@1.0-service +service vendor.qti_gnss_service /vendor/bin/hw/vendor.qti.gnss@1.0-service class hal user gps group system gps radio diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.iop@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.iop@1.0-service.rc index f901d55..1543b61 100644 --- a/proprietary/vendor/etc/init/vendor.qti.hardware.iop@1.0-service.rc +++ b/proprietary/vendor/etc/init/vendor.qti.hardware.iop@1.0-service.rc @@ -1,4 +1,4 @@ -service iop-hal-1-0 /vendor/bin/hw/vendor.qti.hardware.iop@1.0-service +service vendor.iop-hal-1-0 /vendor/bin/hw/vendor.qti.hardware.iop@1.0-service class hal user root group root readproc diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc index d019a46..200d9ce 100644 --- a/proprietary/vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc +++ b/proprietary/vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc @@ -1,4 +1,4 @@ -service perf-hal-1-0 /vendor/bin/hw/vendor.qti.hardware.perf@1.0-service +service vendor.perf-hal-1-0 /vendor/bin/hw/vendor.qti.hardware.perf@1.0-service class hal user root group root readproc diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc index d88fde1..30793a0 100644 --- a/proprietary/vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc +++ b/proprietary/vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc @@ -1,4 +1,4 @@ -service qdutils_disp-1-0 /vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti +service vendor.qdutils_disp-1-0 /vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti class hal user system group system drmrpc