From bf55cc0583b7c913be7946c3a3a96ef359b6d8b7 Mon Sep 17 00:00:00 2001 From: Jaekyun Seok Date: Wed, 30 Aug 2017 11:07:00 +0900 Subject: [PATCH] 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 walleye device Bug: 36796459 Change-Id: I9b51b48ae553707b9f140480b9e630c7dbbfa471 --- media/audioserver/audioserver.rc | 3 +++ services/mediacodec/android.hardware.media.omx@1.0-service.rc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/media/audioserver/audioserver.rc b/media/audioserver/audioserver.rc index 9d42bce069..7874f905d8 100644 --- a/media/audioserver/audioserver.rc +++ b/media/audioserver/audioserver.rc @@ -5,6 +5,9 @@ service audioserver /system/bin/audioserver group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct ioprio rt 4 writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks + onrestart restart vendor.audio-hal-2-0 + # Keep the original service name for backward compatibility when upgrading + # O-MR1 devices with framework-only. onrestart restart audio-hal-2-0 on property:vts.native_server.on=1 diff --git a/services/mediacodec/android.hardware.media.omx@1.0-service.rc b/services/mediacodec/android.hardware.media.omx@1.0-service.rc index ec51d650fd..3ef9a853e9 100644 --- a/services/mediacodec/android.hardware.media.omx@1.0-service.rc +++ b/services/mediacodec/android.hardware.media.omx@1.0-service.rc @@ -1,4 +1,4 @@ -service mediacodec /vendor/bin/hw/android.hardware.media.omx@1.0-service +service vendor.media.omx /vendor/bin/hw/android.hardware.media.omx@1.0-service class main user mediacodec group camera drmrpc mediadrm