From 551b8d15ce56661f012a37772ffd611c0fa4915a Mon Sep 17 00:00:00 2001 From: Felix Date: Mon, 24 Jun 2019 10:46:26 +0200 Subject: [PATCH] Add interface info to .rc files Signed-off-by: Felix Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70 --- .../default/android.hardware.authsecret@1.0-service.rc | 1 + .../default/android.hardware.bluetooth@1.0-service.rc | 1 + boot/1.0/default/android.hardware.boot@1.0-service.rc | 1 + .../android.hardware.broadcastradio@1.1-service.rc | 2 ++ .../android.hardware.broadcastradio@2.0-service.rc | 1 + .../default/android.hardware.configstore@1.1-service.rc | 2 ++ .../android.hardware.confirmationui@1.0-service.rc | 1 + .../default/android.hardware.contexthub@1.0-service.rc | 1 + drm/1.0/default/android.hardware.drm@1.0-service.rc | 2 ++ .../default/android.hardware.gatekeeper@1.0-service.rc | 1 + gnss/1.0/default/android.hardware.gnss@1.0-service.rc | 1 + gnss/1.1/default/android.hardware.gnss@1.1-service.rc | 2 ++ .../android.hardware.graphics.allocator@2.0-service.rc | 1 + .../android.hardware.graphics.composer@2.1-service.rc | 1 + .../android.hardware.graphics.composer@2.2-service.rc | 2 ++ ir/1.0/default/android.hardware.ir@1.0-service.rc | 1 + .../default/android.hardware.keymaster@3.0-service.rc | 1 + .../default/android.hardware.keymaster@4.0-service.rc | 1 + .../1.0/default/android.hardware.memtrack@1.0-service.rc | 1 + nfc/1.0/default/android.hardware.nfc@1.0-service.rc | 1 + power/1.0/default/android.hardware.power@1.0-service.rc | 1 + .../default/android.hardware.radio@1.2-radio-service.rc | 9 +++++++++ .../default/android.hardware.radio@1.2-sap-service.rc | 3 +++ .../default/android.hardware.radio.config@1.0-service.rc | 1 + .../1.0/default/android.hardware.sensors@1.0-service.rc | 1 + .../1.0/default/android.hardware.thermal@1.0-service.rc | 1 + .../1.0/default/android.hardware.tv.cec@1.0-service.rc | 1 + .../1.0/default/android.hardware.tv.input@1.0-service.rc | 1 + usb/1.0/default/android.hardware.usb@1.0-service.rc | 1 + .../1.0/default/android.hardware.vibrator@1.0-service.rc | 1 + vr/1.0/default/android.hardware.vr@1.0-service.rc | 1 + wifi/1.2/default/android.hardware.wifi@1.0-service.rc | 3 +++ 32 files changed, 49 insertions(+) diff --git a/authsecret/1.0/default/android.hardware.authsecret@1.0-service.rc b/authsecret/1.0/default/android.hardware.authsecret@1.0-service.rc index e82da7eef8..1a95cd0880 100644 --- a/authsecret/1.0/default/android.hardware.authsecret@1.0-service.rc +++ b/authsecret/1.0/default/android.hardware.authsecret@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.authsecret-1-0 /vendor/bin/hw/android.hardware.authsecret@1.0-service + interface android.hardware.authsecret@1.0::IAuthSecret default class hal user system group system diff --git a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc index b615227a4e..9fa128dfc6 100644 --- a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc +++ b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.bluetooth-1-0 /vendor/bin/hw/android.hardware.bluetooth@1.0-service + interface android.hardware.bluetooth@1.0::IBluetoothHci default class hal capabilities BLOCK_SUSPEND NET_ADMIN SYS_NICE user bluetooth diff --git a/boot/1.0/default/android.hardware.boot@1.0-service.rc b/boot/1.0/default/android.hardware.boot@1.0-service.rc index 32f3a45b35..b8125e1366 100644 --- a/boot/1.0/default/android.hardware.boot@1.0-service.rc +++ b/boot/1.0/default/android.hardware.boot@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service + interface android.hardware.boot@1.0::IBootControl default class early_hal user root group root diff --git a/broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc b/broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc index 7c57135fc2..6fcbfa6030 100644 --- a/broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc +++ b/broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc @@ -1,4 +1,6 @@ service broadcastradio-hal /vendor/bin/hw/android.hardware.broadcastradio@1.1-service + interface android.hardware.broadcastradio@1.0::IBroadcastRadioFactory default + interface android.hardware.broadcastradio@1.1::IBroadcastRadioFactory default class hal user audioserver group audio diff --git a/broadcastradio/2.0/default/android.hardware.broadcastradio@2.0-service.rc b/broadcastradio/2.0/default/android.hardware.broadcastradio@2.0-service.rc index 7d68b6cebb..dd8c9c6281 100644 --- a/broadcastradio/2.0/default/android.hardware.broadcastradio@2.0-service.rc +++ b/broadcastradio/2.0/default/android.hardware.broadcastradio@2.0-service.rc @@ -1,4 +1,5 @@ service broadcastradio-hal2 /vendor/bin/hw/android.hardware.broadcastradio@2.0-service + interface android.hardware.broadcastradio@2.0::IBroadcastRadio default class hal user audioserver group audio diff --git a/configstore/1.1/default/android.hardware.configstore@1.1-service.rc b/configstore/1.1/default/android.hardware.configstore@1.1-service.rc index 105678acb2..d62c4a8ae4 100644 --- a/configstore/1.1/default/android.hardware.configstore@1.1-service.rc +++ b/configstore/1.1/default/android.hardware.configstore@1.1-service.rc @@ -1,4 +1,6 @@ service vendor.configstore-hal /vendor/bin/hw/android.hardware.configstore@1.1-service + interface android.hardware.configstore@1.0::ISurfaceFlingerConfigs default + interface android.hardware.configstore@1.1::ISurfaceFlingerConfigs default class hal animation user system group system diff --git a/confirmationui/1.0/default/android.hardware.confirmationui@1.0-service.rc b/confirmationui/1.0/default/android.hardware.confirmationui@1.0-service.rc index c04e55eb67..adc7222bff 100644 --- a/confirmationui/1.0/default/android.hardware.confirmationui@1.0-service.rc +++ b/confirmationui/1.0/default/android.hardware.confirmationui@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.confirmationui-1-0 /vendor/bin/hw/android.hardware.confirmationui@1.0-service + interface android.hardware.confirmationui@1.0::IConfirmationUI default class hal user nobody group drmrpc diff --git a/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc b/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc index a8c9487741..b659be8098 100644 --- a/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc +++ b/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.contexthub-hal-1-0 /vendor/bin/hw/android.hardware.contexthub@1.0-service + interface android.hardware.contexthub@1.0::IContexthub default class hal user system group system diff --git a/drm/1.0/default/android.hardware.drm@1.0-service.rc b/drm/1.0/default/android.hardware.drm@1.0-service.rc index a3457b5234..790ededbe7 100644 --- a/drm/1.0/default/android.hardware.drm@1.0-service.rc +++ b/drm/1.0/default/android.hardware.drm@1.0-service.rc @@ -1,4 +1,6 @@ service vendor.drm-hal-1-0 /vendor/bin/hw/android.hardware.drm@1.0-service + interface android.hardware.drm@1.0::ICryptoFactory default + interface android.hardware.drm@1.0::IDrmFactory default class hal user media group mediadrm drmrpc diff --git a/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc b/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc index da332c76da..b13a9baefc 100644 --- a/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc +++ b/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.gatekeeper-1-0 /vendor/bin/hw/android.hardware.gatekeeper@1.0-service + interface android.hardware.gatekeeper@1.0::IGatekeeper default class hal user system group system diff --git a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc index 1a44d34044..1300d81f02 100644 --- a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc +++ b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.gnss_service /vendor/bin/hw/android.hardware.gnss@1.0-service + interface android.hardware.gnss@1.0::IGnss default class hal user gps group system gps radio diff --git a/gnss/1.1/default/android.hardware.gnss@1.1-service.rc b/gnss/1.1/default/android.hardware.gnss@1.1-service.rc index 0cf7c493a0..73901bf379 100644 --- a/gnss/1.1/default/android.hardware.gnss@1.1-service.rc +++ b/gnss/1.1/default/android.hardware.gnss@1.1-service.rc @@ -1,4 +1,6 @@ service gnss-1-1 /vendor/bin/hw/android.hardware.gnss@1.1-service + interface android.hardware.gnss@1.0::IGnss default + interface android.hardware.gnss@1.1::IGnss default class hal user system group system diff --git a/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc b/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc index 6eee71f6e7..ea64f974b7 100644 --- a/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc +++ b/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc @@ -1,4 +1,5 @@ service vendor.gralloc-2-0 /vendor/bin/hw/android.hardware.graphics.allocator@2.0-service + interface android.hardware.graphics.allocator@2.0::IAllocator default class hal animation user system group graphics drmrpc diff --git a/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc b/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc index 5a5b51e8e1..cbd589afca 100644 --- a/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc +++ b/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc @@ -1,4 +1,5 @@ service vendor.hwcomposer-2-1 /vendor/bin/hw/android.hardware.graphics.composer@2.1-service + interface android.hardware.graphics.composer@2.1::IComposer default class hal animation user system group graphics drmrpc diff --git a/graphics/composer/2.2/default/android.hardware.graphics.composer@2.2-service.rc b/graphics/composer/2.2/default/android.hardware.graphics.composer@2.2-service.rc index efe6dadbc2..0d7e86f91e 100644 --- a/graphics/composer/2.2/default/android.hardware.graphics.composer@2.2-service.rc +++ b/graphics/composer/2.2/default/android.hardware.graphics.composer@2.2-service.rc @@ -1,4 +1,6 @@ service vendor.hwcomposer-2-2 /vendor/bin/hw/android.hardware.graphics.composer@2.2-service + interface android.hardware.graphics.composer@2.1::IComposer default + interface android.hardware.graphics.composer@2.2::IComposer default class hal animation user system group graphics drmrpc diff --git a/ir/1.0/default/android.hardware.ir@1.0-service.rc b/ir/1.0/default/android.hardware.ir@1.0-service.rc index 0d069671bb..975cf0112e 100644 --- a/ir/1.0/default/android.hardware.ir@1.0-service.rc +++ b/ir/1.0/default/android.hardware.ir@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.ir-hal-1-0 /vendor/bin/hw/android.hardware.ir@1.0-service + interface android.hardware.ir@1.0::IConsumerIr class hal user system group system diff --git a/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc b/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc index ea8d490fd8..dffaca51e9 100644 --- a/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc +++ b/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc @@ -1,4 +1,5 @@ service vendor.keymaster-3-0 /vendor/bin/hw/android.hardware.keymaster@3.0-service + interface android.hardware.keymaster@3.0::IKeymasterDevice default class early_hal user nobody group drmrpc diff --git a/keymaster/4.0/default/android.hardware.keymaster@4.0-service.rc b/keymaster/4.0/default/android.hardware.keymaster@4.0-service.rc index 2ce439ee95..2adfd88ce9 100644 --- a/keymaster/4.0/default/android.hardware.keymaster@4.0-service.rc +++ b/keymaster/4.0/default/android.hardware.keymaster@4.0-service.rc @@ -1,4 +1,5 @@ service vendor.keymaster-4-0 /vendor/bin/hw/android.hardware.keymaster@4.0-service + interface android.hardware.keymaster@4.0::IKeymasterDevice default class early_hal user system group system drmrpc diff --git a/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc b/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc index 4327a20ffe..f5eee54cfb 100644 --- a/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc +++ b/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.memtrack-hal-1-0 /vendor/bin/hw/android.hardware.memtrack@1.0-service + interface android.hardware.memtrack@1.0::IMemtrack default class hal user system group system diff --git a/nfc/1.0/default/android.hardware.nfc@1.0-service.rc b/nfc/1.0/default/android.hardware.nfc@1.0-service.rc index 3a5c776147..27e35d22ff 100644 --- a/nfc/1.0/default/android.hardware.nfc@1.0-service.rc +++ b/nfc/1.0/default/android.hardware.nfc@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.0-service + interface android.hardware.nfc@1.0::INfc default class hal user nfc group nfc diff --git a/power/1.0/default/android.hardware.power@1.0-service.rc b/power/1.0/default/android.hardware.power@1.0-service.rc index 657c7336d2..f3fd303c65 100644 --- a/power/1.0/default/android.hardware.power@1.0-service.rc +++ b/power/1.0/default/android.hardware.power@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.0-service + interface android.hardware.power@1.0::IPower default class hal user system group system diff --git a/radio/1.2/default/android.hardware.radio@1.2-radio-service.rc b/radio/1.2/default/android.hardware.radio@1.2-radio-service.rc index e126cd83b3..eab37ecb9c 100644 --- a/radio/1.2/default/android.hardware.radio@1.2-radio-service.rc +++ b/radio/1.2/default/android.hardware.radio@1.2-radio-service.rc @@ -1,4 +1,13 @@ service vendor.radio-1-2 /vendor/bin/hw/android.hardware.radio@1.2-radio-service + interface android.hardware.radio@1.0::IRadio slot1 + interface android.hardware.radio@1.0::IRadio slot2 + interface android.hardware.radio@1.0::IRadio slot3 + interface android.hardware.radio@1.1::IRadio slot1 + interface android.hardware.radio@1.1::IRadio slot2 + interface android.hardware.radio@1.1::IRadio slot3 + interface android.hardware.radio@1.2::IRadio slot1 + interface android.hardware.radio@1.2::IRadio slot2 + interface android.hardware.radio@1.2::IRadio slot3 class hal user system group system diff --git a/radio/1.2/default/android.hardware.radio@1.2-sap-service.rc b/radio/1.2/default/android.hardware.radio@1.2-sap-service.rc index 845e6e58e9..9f163f6ef5 100644 --- a/radio/1.2/default/android.hardware.radio@1.2-sap-service.rc +++ b/radio/1.2/default/android.hardware.radio@1.2-sap-service.rc @@ -1,4 +1,7 @@ service vendor.sap-1-2 /vendor/bin/hw/android.hardware.radio@1.2-sap-service + interface android.hardware.radio@1.0::ISap slot1 + interface android.hardware.radio@1.1::ISap slot1 + interface android.hardware.radio@1.2::ISap slot1 class hal user system group system diff --git a/radio/config/1.0/default/android.hardware.radio.config@1.0-service.rc b/radio/config/1.0/default/android.hardware.radio.config@1.0-service.rc index fad16b1caa..94d5edb426 100644 --- a/radio/config/1.0/default/android.hardware.radio.config@1.0-service.rc +++ b/radio/config/1.0/default/android.hardware.radio.config@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.radio-config-hal-1-0 /vendor/bin/hw/android.hardware.radio.config@1.0-service + interface android.hardware.radio.config@1.0::IRadioConfig default class hal user system group system diff --git a/sensors/1.0/default/android.hardware.sensors@1.0-service.rc b/sensors/1.0/default/android.hardware.sensors@1.0-service.rc index b54842d66f..4faa562dcf 100644 --- a/sensors/1.0/default/android.hardware.sensors@1.0-service.rc +++ b/sensors/1.0/default/android.hardware.sensors@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service + interface android.hardware.sensors@1.0::ISensors default class hal user system group system wakelock diff --git a/thermal/1.0/default/android.hardware.thermal@1.0-service.rc b/thermal/1.0/default/android.hardware.thermal@1.0-service.rc index cf9bdee7a0..ba3ce82662 100644 --- a/thermal/1.0/default/android.hardware.thermal@1.0-service.rc +++ b/thermal/1.0/default/android.hardware.thermal@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.thermal-hal-1-0 /vendor/bin/hw/android.hardware.thermal@1.0-service + interface android.hardware.thermal@1.0::IThermal default class hal user system group system diff --git a/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc b/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc index 8595099d6e..6d2522987f 100644 --- a/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc +++ b/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.cec-hal-1-0 /vendor/bin/hw/android.hardware.tv.cec@1.0-service + interface android.hardware.tv.cec@1.0::IHdmiCec default class hal user system group system diff --git a/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc index 972c6547d2..6cb9a43db6 100644 --- a/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc +++ b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.tv-input-1-0 /vendor/bin/hw/android.hardware.tv.input@1.0-service + interface android.hardware.tv.input@1.0::ITvInput default class hal user system group system diff --git a/usb/1.0/default/android.hardware.usb@1.0-service.rc b/usb/1.0/default/android.hardware.usb@1.0-service.rc index b7a0c63318..3c44d21bcd 100644 --- a/usb/1.0/default/android.hardware.usb@1.0-service.rc +++ b/usb/1.0/default/android.hardware.usb@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service + interface android.hardware.usb@1.0::IUsb default class hal user system group system diff --git a/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc b/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc index 1123eabf38..1bd5c1013c 100644 --- a/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc +++ b/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service + interface android.hardware.vibrator@1.0::IVibrator default class hal user system group system diff --git a/vr/1.0/default/android.hardware.vr@1.0-service.rc b/vr/1.0/default/android.hardware.vr@1.0-service.rc index fc4934cf25..5486674584 100644 --- a/vr/1.0/default/android.hardware.vr@1.0-service.rc +++ b/vr/1.0/default/android.hardware.vr@1.0-service.rc @@ -1,4 +1,5 @@ service vendor.vr-1-0 /vendor/bin/hw/android.hardware.vr@1.0-service + interface android.hardware.vr@1.0::IVr default class hal user system group system diff --git a/wifi/1.2/default/android.hardware.wifi@1.0-service.rc b/wifi/1.2/default/android.hardware.wifi@1.0-service.rc index cf849d04ab..2317bac546 100644 --- a/wifi/1.2/default/android.hardware.wifi@1.0-service.rc +++ b/wifi/1.2/default/android.hardware.wifi@1.0-service.rc @@ -1,4 +1,7 @@ service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service + interface android.hardware.wifi@1.0::IWifi default + interface android.hardware.wifi@1.1::IWifi default + interface android.hardware.wifi@1.2::IWifi default class hal capabilities NET_ADMIN NET_RAW SYS_MODULE user wifi