diff --git a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml
index 3ad537a8..1261632d 100644
--- a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml
+++ b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml
@@ -2,11 +2,6 @@
android.hardware.biometrics.fingerprint
hwbinder
- 2.1
-
- IBiometricsFingerprint
- default
-
@2.1::IBiometricsFingerprint/default
diff --git a/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml b/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml
index a8cde12b..a8bc15e2 100644
--- a/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml
+++ b/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml
@@ -2,11 +2,6 @@
android.hardware.light
hwbinder
- 2.0
-
- ILight
- default
-
@2.0::ILight/default
diff --git a/manifest.xml b/manifest.xml
index 8ad776eb..d8398b1e 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,85 +2,41 @@
android.hardware.audio
hwbinder
- 5.0
-
- IDevicesFactory
- default
-
@5.0::IDevicesFactory/default
android.hardware.audio.effect
hwbinder
- 5.0
-
- IEffectsFactory
- default
-
@5.0::IEffectsFactory/default
android.hardware.authsecret
hwbinder
- 1.0
-
- IAuthSecret
- default
-
@1.0::IAuthSecret/default
android.hardware.bluetooth
hwbinder
- 1.0
-
- IBluetoothHci
- default
-
@1.0::IBluetoothHci/default
android.hardware.bluetooth.audio
hwbinder
- 2.0
-
- IBluetoothAudioProvidersFactory
- default
-
@2.0::IBluetoothAudioProvidersFactory/default
android.hardware.camera.provider
hwbinder
- 2.6
-
- ICameraProvider
- legacy/0
-
@2.6::ICameraProvider/legacy/0
android.hardware.configstore
hwbinder
- 1.1
-
- ISurfaceFlingerConfigs
- default
-
@1.1::ISurfaceFlingerConfigs/default
android.hardware.drm
hwbinder
- 1.0
-
- ICryptoFactory
- default
-
-
- IDrmFactory
- default
-
@1.0::ICryptoFactory/default
@1.0::IDrmFactory/default
@1.2::ICryptoFactory/widevine
@@ -91,41 +47,21 @@
android.hardware.gatekeeper
hwbinder
- 1.0
-
- IGatekeeper
- default
-
@1.0::IGatekeeper/default
android.hardware.graphics.allocator
hwbinder
- 2.0
-
- IAllocator
- default
-
@2.0::IAllocator/default
android.hardware.graphics.composer
hwbinder
- 2.1
-
- IComposer
- default
-
@2.1::IComposer/default
android.hardware.graphics.mapper
passthrough
- 2.1
-
- IMapper
- default
-
@2.1::IMapper/default
@3.0::IMapper/default
@4.0::IMapper/default
@@ -133,26 +69,12 @@
android.hardware.media.omx
hwbinder
- 1.0
-
- IOmx
- default
-
-
- IOmxStore
- default
-
@1.0::IOmx/default
@1.0::IOmxStore/default
android.hardware.memtrack
hwbinder
- 1.0
-
- IMemtrack
- default
-
@1.0::IMemtrack/default
@@ -166,114 +88,52 @@
android.hardware.radio.config
hwbinder
- 1.1
-
- IRadioConfig
- default
-
@1.1::IRadioConfig/default
android.hardware.renderscript
passthrough
- 1.0
-
- IDevice
- default
-
@1.0::IDevice/default
android.hardware.sensors
hwbinder
- 1.0
-
- ISensors
- default
-
-
- ISensorManager
- default
-
@1.0::ISensors/default
@1.0::ISensorManager/default
android.hardware.soundtrigger
hwbinder
- 2.1
-
- ISoundTriggerHw
- default
-
@1.0::ISoundTriggerHw/default
android.hardware.tetheroffload.config
hwbinder
- 1.0
-
- IOffloadConfig
- default
-
@1.0::IOffloadConfig/default
android.hardware.tetheroffload.control
hwbinder
- 1.0
-
- IOffloadControl
- default
-
@1.0::IOffloadControl/default
android.hardware.usb
hwbinder
- 1.0
-
- IUsb
- default
-
@1.0::IUsb/default
vendor.qti.hardware.wifi.hostapd
hwbinder
- 1.1
-
- IHostapdVendor
- default
-
@1.1::IHostapdVendor/default
vendor.qti.hardware.wifi.supplicant
hwbinder
- 2.0
-
- ISupplicantVendor
- default
-
@2.0::ISupplicantVendor/default
com.fingerprints.extension
hwbinder
- 1.0
-
- IFingerprintEngineering
- default
-
-
- IFingerprintNavigation
- default
-
-
- IFingerprintSensorTest
- default
-
@1.0::IFingerprintEngineering/default
@1.0::IFingerprintNavigation/default
@1.0::IFingerprintSensorTest/default
@@ -281,443 +141,220 @@
com.qualcomm.qti.ant
hwbinder
- 1.0
-
- IAntHci
- default
-
@1.0::IAntHci/default
com.qualcomm.qti.dpm.api
hwbinder
- 1.0
-
- IdpmQmi
- dpmQmiService
-
@1.0::IdpmQmi/dpmQmiService
com.qualcomm.qti.imscmservice
hwbinder
- 2.2
-
- IImsCmService
- qti.ims.connectionmanagerservice
-
@2.2::IImsCmService/qti.ims.connectionmanagerservice
com.qualcomm.qti.uceservice
hwbinder
- 2.2
-
- IUceService
- com.qualcomm.qti.uceservice
-
@2.2::IUceService/com.qualcomm.qti.uceservice
com.qualcomm.qti.wifidisplayhal
hwbinder
- 1.0
-
- IDSManager
- wifidisplaydshal
-
-
- IHDCPSession
- wifidisplayhdcphal
-
@1.0::IDSManager/wifidisplaydshal
@1.0::IHDCPSession/wifidisplayhdcphal
vendor.display.color
hwbinder
- 1.0
-
- IDisplayColor
- default
-
@1.0::IDisplayColor/default
vendor.display.config
hwbinder
- 1.9
-
- IDisplayConfig
- default
-
@2.0::IDisplayConfig/default
vendor.display.postproc
hwbinder
- 1.0
-
- IDisplayPostproc
- default
-
@1.0::IDisplayPostproc/default
vendor.goodix.hardware.fingerprint
hwbinder
- 1.0
-
- IGoodixBiometricsFingerprint
- default
-
@1.0::IGoodixBiometricsFingerprint/default
vendor.qti.hardware.data.iwlan
hwbinder
- 1.0
-
- IIWlan
- slot1
- slot2
-
@1.0::IIWlan/slot1
@1.0::IIWlan/slot2
vendor.qti.data.factory
hwbinder
- 2.2
-
- IFactory
- default
-
@2.2::IFactory/default
vendor.qti.esepowermanager
hwbinder
- 1.1
-
- IEsePowerManager
- default
-
@1.1::IEsePowerManager/default
vendor.qti.hardware.alarm
hwbinder
- 1.0
-
- IAlarm
- default
-
@1.0::IAlarm/default
vendor.qti.hardware.bluetooth_sar
hwbinder
- 1.0
-
- IBluetoothSar
- default
-
@1.0::IBluetoothSar/default
vendor.qti.hardware.btconfigstore
hwbinder
- 1.0
-
- IBTConfigStore
- default
-
@1.0::IBTConfigStore/default
vendor.qti.hardware.data.latency
hwbinder
- 1.0
-
- ILinkLatency
- default
-
@1.0::ILinkLatency/default
vendor.qti.hardware.factory
hwbinder
- 1.1
-
- IFactory
- default
-
@1.1::IFactory/default
vendor.qti.hardware.wifi.wifilearner
hwbinder
- 1.0
-
- IWifiStats
- wifiStats
-
@1.0::IWifiStats/wifiStats
vendor.qti.hardware.fm
hwbinder
- 1.0
-
- IFmHci
- default
-
@1.0::IFmHci/default
vendor.qti.hardware.qteeconnector
hwbinder
- 1.0
-
- IAppConnector
- default
-
-
- IGPAppConnector
- default
-
@1.0::IAppConnector/default
@1.0::IGPAppConnector/default
-
+
vendor.qti.ims.factory
hwbinder
- 1.0
-
- IImsFactory
- default
-
@1.0::IImsFactory/default
vendor.qti.hardware.radio.am
hwbinder
- 1.0
-
- IQcRilAudio
- slot1
- slot2
-
@1.0::IQcRilAudio/slot1
@1.0::IQcRilAudio/slot2
vendor.qti.hardware.data.connection
hwbinder
- 1.1
-
- IDataConnection
- slot1
- slot2
-
@1.1::IDataConnection/slot1
@1.1::IDataConnection/slot2
vendor.qti.hardware.cacert
hwbinder
- 1.0
-
- IService
- default
-
@1.0::IService/default
vendor.qti.hardware.radio.ims
hwbinder
- 1.7
-
- IImsRadio
- imsradio0
- imsradio1
-
@1.7::IImsRadio/imsradio0
@1.7::IImsRadio/imsradio1
vendor.qti.hardware.qseecom
hwbinder
- 1.0
-
- IQSEECom
- default
-
@1.0::IQSEECom/default
vendor.qti.hardware.radio.internal.deviceinfo
hwbinder
- 1.0
-
- IDeviceInfo
- deviceinfo
-
@1.0::IDeviceInfo/deviceinfo
vendor.qti.hardware.radio.lpa
hwbinder
- 1.0
-
- IUimLpa
- UimLpa0
- UimLpa1
-
@1.0::IUimLpa/UimLpa0
@1.0::IUimLpa/UimLpa1
vendor.qti.hardware.radio.qcrilhook
hwbinder
- 1.0
-
- IQtiOemHook
- oemhook0
- oemhook1
-
@1.0::IQtiOemHook/oemhook0
@1.0::IQtiOemHook/oemhook1
vendor.qti.hardware.radio.qtiradio
hwbinder
- 2.4
-
- IQtiRadio
- slot1
- slot2
-
@2.4::IQtiRadio/slot1
@2.4::IQtiRadio/slot2
vendor.qti.hardware.radio.uim
hwbinder
- 1.2
-
- IUim
- Uim0
- Uim1
-
@1.2::IUim/Uim0
@1.2::IUim/Uim1
vendor.qti.hardware.radio.uim_remote_client
hwbinder
- 1.2
-
- IUimRemoteServiceClient
- uimRemoteClient0
- uimRemoteClient1
-
@1.2::IUimRemoteServiceClient/uimRemoteClient0
@1.2::IUimRemoteServiceClient/uimRemoteClient1
vendor.qti.hardware.radio.uim_remote_server
hwbinder
- 1.0
-
- IUimRemoteServiceServer
- uimRemoteServer0
- uimRemoteServer1
-
@1.0::IUimRemoteServiceServer/uimRemoteServer0
@1.0::IUimRemoteServiceServer/uimRemoteServer1
vendor.qti.hardware.soter
hwbinder
- 1.0
-
- ISoter
- default
-
@1.0::ISoter/default
vendor.qti.hardware.qdutils_disp
hwbinder
- 1.0
-
- IQdutilsDisp
- default
-
@1.0::IQdutilsDisp/default
vendor.qti.hardware.tui_comm
hwbinder
- 1.0
-
- ITuiComm
- default
-
@1.0::ITuiComm/default
vendor.qti.ims.callinfo
hwbinder
- 1.0
-
- IService
- default
-
@1.0::IService/default
vendor.qti.imsrtpservice
hwbinder
- 3.0
-
- IRTPService
- imsrtpservice
-
@3.0::IRTPService/imsrtpservice
vendor.qti.hardware.mwqemadapter
hwbinder
- 1.0
-
- IMwqemAdapter
- MwqemAdapter
-
@1.0::IMwqemAdapter/MwqemAdapter
vendor.xiaomi.hardware.mlipay
hwbinder
- 1.1
-
- IMlipayService
- default
-
@1.1::IMlipayService/default
vendor.xiaomi.hardware.mfidoca
hwbinder
- 1.0
-
- IFidoService
- default
-
@1.0::IFidoService/default