From ded4517e3abfba55e964fdf0a9fe3321c4b2b611 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Tue, 13 Apr 2021 13:08:34 -0700 Subject: [PATCH] Defines two separate product FCMs for redfin VF: R vendor and S vendor. Both are device manifest level=5, but the R vendor and S vendor provide a slightly different set of HALs. Bug: 184545288 Test: Include the R FCM on a system-only build merged with an R-based vendor, merge & boot Test: Likewise, for S FCM and S-based vendor. Change-Id: I5658dc4a9d989e38c7fa05337c37457598368aa2 --- vf/Android.bp | 15 +- ...> device_framework_matrix_product.R.5.xml} | 0 vf/device_framework_matrix_product.S.5.xml | 345 ++++++++++++++++++ 3 files changed, 357 insertions(+), 3 deletions(-) rename vf/{device_framework_matrix_product.5.xml => device_framework_matrix_product.R.5.xml} (100%) create mode 100644 vf/device_framework_matrix_product.S.5.xml diff --git a/vf/Android.bp b/vf/Android.bp index 80fde57..c8b5215 100644 --- a/vf/Android.bp +++ b/vf/Android.bp @@ -3,10 +3,19 @@ package { } vintf_compatibility_matrix { - name: "redfin_product_compatibility_matrix.5.xml", - stem: "compatibility_matrix.redfin.5.xml", + name: "redfin_product_compatibility_matrix.R.5.xml", + stem: "compatibility_matrix.redfin.R.5.xml", product_specific: true, srcs: [ - "device_framework_matrix_product.5.xml", + "device_framework_matrix_product.R.5.xml", + ], +} + +vintf_compatibility_matrix { + name: "redfin_product_compatibility_matrix.S.5.xml", + stem: "compatibility_matrix.redfin.S.5.xml", + product_specific: true, + srcs: [ + "device_framework_matrix_product.S.5.xml", ], } diff --git a/vf/device_framework_matrix_product.5.xml b/vf/device_framework_matrix_product.R.5.xml similarity index 100% rename from vf/device_framework_matrix_product.5.xml rename to vf/device_framework_matrix_product.R.5.xml diff --git a/vf/device_framework_matrix_product.S.5.xml b/vf/device_framework_matrix_product.S.5.xml new file mode 100644 index 0000000..6d1e32e --- /dev/null +++ b/vf/device_framework_matrix_product.S.5.xml @@ -0,0 +1,345 @@ + + + com.qualcomm.qti.imscmservice + 2.2 + + IImsCmService + qti.ims.connectionmanagerservice + + + + com.qualcomm.qti.uceservice + 2.2 + + IUceService + com.qualcomm.qti.uceservice + + + + vendor.qti.ims.factory + 1.0 + + IImsFactory + default + + + + vendor.qti.data.factory + 2.1 + + IFactory + default + + + + + vendor.qti.hardware.data.iwlan + 1.0 + + IIWlan + slot1 + slot2 + + + + android.hardware.media.c2 + 1.0 + + IComponentStore + default + software + + + + android.hardware.radio + 1.2 + + ISap + slot2 + + + + android.hardware.radio.config + 1.1 + + IRadioConfig + default + + + + vendor.display.color + 1.0-5 + + IDisplayColor + default + + + + vendor.display.config + 2.0 + + IDisplayConfig + default + + + + vendor.display.postproc + 1.0 + + IDisplayPostproc + default + + + + vendor.google.google_battery + 1.1 + + IGoogleBattery + default + + + + vendor.google.radioext + 1.2-3 + + IRadioExt + default + + + + vendor.qti.hardware.radio.am + 1.0 + + IQcRilAudio + slot1 + slot2 + + + + vendor.qti.hardware.radio.ims + 1.6 + + IImsRadio + imsradio0 + imsradio1 + + + + vendor.qti.hardware.radio.lpa + 1.0 + + IUimLpa + UimLpa0 + UimLpa1 + + + + vendor.qti.hardware.radio.qcrilhook + 1.0 + + IQtiOemHook + oemhook0 + oemhook1 + + + + vendor.qti.hardware.radio.uim + 1.2 + + IUim + Uim0 + Uim1 + + + + vendor.qti.hardware.radio.uim_remote_client + 1.0 + + IUimRemoteServiceClient + uimRemoteClient0 + uimRemoteClient1 + + + + vendor.qti.hardware.radio.uim_remote_server + 1.0 + + IUimRemoteServiceServer + uimRemoteServer0 + uimRemoteServer1 + + + + vendor.qti.hardware.tui_comm + 1.0 + + ITuiComm + default + + + + vendor.qti.hardware.display.allocator + 1.0 + 3.0 + 4.0 + + IQtiAllocator + default + + + + vendor.qti.hardware.display.mapper + 2.0 + 3.0 + 4.0 + + IQtiMapper + default + + + + vendor.qti.hardware.display.composer + 3.0 + + IQtiComposer + default + + + + vendor.qti.hardware.radio.internal.deviceinfo + 1.0 + + IDeviceInfo + deviceinfo + + + + vendor.qti.imsrtpservice + 3.0 + + IRTPService + imsrtpservice + + + + vendor.qti.ims.callinfo + 1.0 + + IService + default + + + + hardware.google.bluetooth.sar + 1.0 + + IBluetoothSar + default + + + + hardware.google.bluetooth.bt_channel_avoidance + 1.0 + + IBTChannelAvoidance + default + + + + vendor.google.wifi_ext + 1.2 + + IWifiExt + default + + + + vendor.qti.hardware.cacert + 1.0 + + IService + default + + + + vendor.qti.hardware.data.connection + 1.1 + + IDataConnection + slot1 + slot2 + + + + vendor.qti.hardware.radio.qtiradio + 1.0 + + IQtiRadio + slot1 + slot2 + + + + vendor.qti.hardware.radio.qtiradio + 2.4 + + IQtiRadio + slot1 + slot2 + + + + + vendor.qti.hardware.qseecom + 1.0 + + IQSEECom + default + + + + + vendor.qti.qspmhal + 1.0 + + IQspmhal + default + + + + vendor.qti.hardware.qteeconnector + 1.0 + + IAppConnector + default + + + IGPAppConnector + default + + + + com.google.hardware.pixel.display + + IDisplay + default + + + + + vendor.qti.hardware.dsp + 1.0 + + IDspService + dspservice + + + + vendor.google.wireless_charger + 1.3 + + IWirelessCharger + default + + +