diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b54894b8..69d5ae4e 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -99,6 +99,7 @@ GNSS_HIDL_VERSION := 2.1
LOC_HIDL_VERSION := 4.0
# HIDL
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(COMMON_PATH)/framework_compatibility_matrix.xml
DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
new file mode 100644
index 00000000..9bd448ae
--- /dev/null
+++ b/framework_compatibility_matrix.xml
@@ -0,0 +1,679 @@
+
+
+ android.hardware.audio.effect
+ 7.0
+
+ IEffectsFactory
+ default
+
+
+
+ android.hardware.audio
+ 7.0-1
+
+ IDevicesFactory
+ default
+
+
+
+ android.hardware.biometrics.fingerprint
+ 2.0-3
+
+ IBiometricsFingerprint
+ default
+
+
+
+ android.hardware.bluetooth.audio
+ 1-2
+
+ IBluetoothAudioProviderFactory
+ default
+
+
+
+ android.hardware.camera.provider
+ 2.6
+
+ ICameraProvider
+ legacy/0
+
+
+
+ android.hardware.cas
+ 1.0-2
+
+ IMediaCasService
+ default
+
+
+
+ android.hardware.drm
+ 1-2
+
+ IDrmFactory
+ clearkey
+
+
+
+ android.hardware.drm
+ 1.0-4
+
+ ICryptoFactory
+ widevine
+
+
+ IDrmFactory
+ widevine
+
+
+
+ android.hardware.gnss
+ 2.0-1
+
+ IGnss
+ gnss_vendor
+ default
+
+
+
+ android.hardware.graphics.allocator
+
+ IAllocator
+ default
+
+
+
+ android.hardware.graphics.allocator
+ 4.0
+
+ IAllocator
+ default
+
+
+
+ android.hardware.graphics.mapper
+ 4.0
+
+ IMapper
+ default
+
+
+
+ android.hardware.health
+ 2.0-1
+
+ IHealth
+ default
+
+
+
+ android.hardware.light
+ 1-2
+
+ ILights
+ default
+
+
+
+ android.hardware.memtrack
+ 1-2
+
+ IMemtrack
+ default
+
+
+
+ android.hardware.power
+ 1-3
+
+ IPower
+ default
+
+
+
+ android.hardware.radio.config
+ 1.0-2
+
+ IRadioConfig
+ default
+
+
+
+ android.hardware.radio
+ 1.0-5
+
+ ISap
+ slot2
+
+
+ IRadio
+ slot1
+ slot2
+
+
+
+ android.hardware.sensors
+ 1.0
+
+ ISensors
+ default
+
+
+ ISensorManager
+ default
+
+
+
+ android.hardware.soundtrigger
+ 2.0-3
+
+ ISoundTriggerHw
+ default
+
+
+
+ android.hardware.usb
+ 1.0-3
+
+ IUsb
+ default
+
+
+
+ android.hardware.vibrator
+ 1-2
+
+ IVibrator
+ default
+
+
+
+ android.hardware.wifi.hostapd
+ 1-2
+
+ IHostapd
+ default
+
+
+
+ android.hardware.wifi.supplicant
+ 1-2
+
+ ISupplicant
+ default
+
+
+
+ android.hardware.wifi
+ 1.0-6
+
+ IWifi
+ default
+
+
+
+ com.dsi.ant
+ 1.0
+
+ IAnt
+ default
+
+
+
+ com.fingerprints.extension
+ 1.0
+
+ IFingerprintAuthenticator
+ default
+
+
+ IFingerprintCalibration
+ default
+
+
+ IFingerprintEngineering
+ default
+
+
+ IFingerprintNavigation
+ default
+
+
+ IFingerprintRecalibration
+ default
+
+
+ IFingerprintSenseTouch
+ default
+
+
+ IFingerprintSensorTest
+ default
+
+
+
+ com.qualcomm.qti.dpm.api
+ 1.0
+
+ IdpmQmi
+ dpmQmiService
+
+
+
+ com.qualcomm.qti.imscmservice
+ 2.0-2
+
+ IImsCmService
+ qti.ims.connectionmanagerservice
+
+
+
+ com.qualcomm.qti.uceservice
+ 2.0-3
+
+ IUceService
+ com.qualcomm.qti.uceservice
+
+
+
+ com.qualcomm.qti.wifidisplayhal
+ 1.0
+
+ IDSManager
+ wifidisplaydshal
+
+
+ IHDCPSession
+ wifidisplayhdcphal
+
+
+
+ vendor.display.color
+ 1.0-5
+
+ IDisplayColor
+ default
+
+
+
+ vendor.display.config
+ 2.0
+
+ IDisplayConfig
+ default
+
+
+
+ vendor.display.postproc
+ 1.0
+
+ IDisplayPostproc
+ default
+
+
+
+ vendor.dolby.hardware.dms
+ 2.0
+
+ IDms
+ default
+
+
+
+ vendor.goodix.hardware.fingerprint
+ 1.0
+
+ IGoodixBiometricsFingerprint
+ default
+
+
+
+ vendor.lineage.livedisplay
+ 2.0
+
+ IAdaptiveBacklight
+ default
+
+
+ IDisplayModes
+ default
+
+
+ IPictureAdjustment
+ default
+
+
+
+ vendor.lineage.trust
+ 1.0
+
+ IUsbRestrict
+ default
+
+
+
+ vendor.qti.data.factory
+ 2.0-3
+
+ IFactory
+ default
+
+
+
+ vendor.qti.esepowermanager
+ 1.0-1
+
+ IEsePowerManager
+ default
+
+
+
+ vendor.qti.gnss
+ 1.0-2
+ 2.0-1
+ 3.0
+ 4.0
+
+ ILocHidlGnss
+ gnss_vendor
+
+
+
+ vendor.qti.hardware.alarm
+ 1.0
+
+ IAlarm
+ default
+
+
+
+ vendor.qti.hardware.bluetooth_audio
+ 2.0-1
+
+ IBluetoothAudioProvidersFactory
+ default
+
+
+
+ vendor.qti.hardware.bluetooth_sar
+ 1.0-1
+
+ IBluetoothSar
+ default
+
+
+
+ vendor.qti.hardware.btconfigstore
+ 2.0
+
+ IBTConfigStore
+ default
+
+
+
+ vendor.qti.hardware.capabilityconfigstore
+ 1.0
+
+ ICapabilityConfigStore
+ default
+
+
+
+ vendor.qti.hardware.data.connection
+ 1.0-1
+
+ IDataConnection
+ slot1
+ slot2
+
+
+
+ vendor.qti.hardware.data.iwlan
+ 1.0
+
+ IIWlan
+ slot1
+ slot2
+
+
+
+ vendor.qti.hardware.data.latency
+ 1.0
+
+ ILinkLatency
+ default
+
+
+
+ vendor.qti.hardware.display.allocator
+ 3.0
+ 4.0
+
+ IQtiAllocator
+ default
+
+
+
+ vendor.qti.hardware.display.mapper
+ 3.0
+ 4.0
+
+ IQtiMapper
+ default
+
+
+
+ vendor.qti.hardware.dsp
+ 1.0
+
+ IDspService
+ dspservice
+
+
+
+ vendor.qti.hardware.factory
+ 1.0-1
+
+ IFactory
+ default
+
+
+
+ vendor.qti.hardware.fm
+ 1.0
+
+ IFmHci
+ default
+
+
+
+ vendor.qti.hardware.qccvndhal
+ 1.0
+
+ IQccvndhal
+ qccvndhal
+
+
+
+ vendor.qti.hardware.qdutils_disp
+ 1.0
+
+ IQdutilsDisp
+ default
+
+
+
+ vendor.qti.hardware.qseecom
+ 1.0
+
+ IQSEECom
+ default
+
+
+
+ vendor.qti.hardware.qteeconnector
+ 1.0
+
+ IAppConnector
+ default
+
+
+ IGPAppConnector
+ default
+
+
+
+ vendor.qti.hardware.radio.am
+ 1.0
+
+ IQcRilAudio
+ slot1
+ slot2
+
+
+
+ vendor.qti.hardware.radio.ims
+ 1.0-8
+
+ IImsRadio
+ imsradio0
+ imsradio1
+
+
+
+ vendor.qti.hardware.radio.internal.deviceinfo
+ 1.0
+
+ IDeviceInfo
+ deviceinfo
+
+
+
+ vendor.qti.hardware.radio.lpa
+ 1.0-2
+
+ IUimLpa
+ UimLpa0
+ UimLpa1
+
+
+
+ vendor.qti.hardware.radio.qcrilhook
+ 1.0
+
+ IQtiOemHook
+ oemhook0
+ oemhook1
+
+
+
+ vendor.qti.hardware.radio.qtiradio
+ 1.0
+ 2.0-6
+
+ IQtiRadio
+ slot1
+ slot2
+
+
+
+ vendor.qti.hardware.radio.uim
+ 1.0-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.soter
+ 1.0
+
+ ISoter
+ default
+
+
+
+ vendor.qti.hardware.tui_comm
+ 1.0
+
+ ITuiComm
+ default
+
+
+
+ vendor.qti.hardware.wifi.hostapd
+ 1.1
+
+ IHostapdVendor
+ default
+
+
+
+ vendor.qti.hardware.wifi.supplicant
+ 2.0
+
+ ISupplicantVendor
+ default
+
+
+
+ vendor.qti.hardware.wifi.wifilearner
+ 1.0
+
+ IWifiStats
+ IWifiStats
+
+
+
+ vendor.qti.ims.callinfo
+ 1.0
+
+ IService
+ default
+
+
+
+ vendor.qti.ims.factory
+ 1.0-1
+
+ IImsFactory
+ default
+
+
+
+ vendor.qti.imsrtpservice
+ 3.0
+
+ IRTPService
+ imsrtpservice
+
+
+
+ vendor.xiaomi.hardware.mlipay
+ 1.0-1
+
+ IMlipayService
+ default
+
+
+
diff --git a/manifest.xml b/manifest.xml
index 20c91122..e518be43 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -168,9 +168,9 @@
@1.0::IDspService/dspservice
- vendor.qti.hardware.perf
+ vendor.qti.hardware.qdutils_disp
hwbinder
- @2.2::IPerf/default
+ @1.0::IQdutilsDisp/default
vendor.qti.hardware.qseecom