zenfone9: zf8/lahaina --> zf9/taro
diff --git a/manifest/compatibility_matrix.xml b/manifest/compatibility_matrix.xml
index a3e3746..caca1f1 100644
--- a/manifest/compatibility_matrix.xml
+++ b/manifest/compatibility_matrix.xml
@@ -2,15 +2,7 @@
Input:
compatibility_matrix.xml
-->
-<compatibility-matrix version="2.0" type="device">
- <hal format="hidl" optional="false">
- <name>android.frameworks.schedulerservice</name>
- <version>1.0</version>
- <interface>
- <name>ISchedulingPolicyService</name>
- <instance>default</instance>
- </interface>
- </hal>
+<compatibility-matrix version="4.0" type="device">
<hal format="hidl" optional="false">
<name>android.frameworks.sensorservice</name>
<version>1.0</version>
@@ -61,7 +53,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.qccsyshal</name>
- <version>1.0</version>
+ <version>1.0-1</version>
<interface>
<name>IQccsyshal</name>
<instance>qccsyshal</instance>
@@ -73,6 +65,7 @@
<interface>
<name>Isigma_miracast</name>
<instance>sigmahal</instance>
+ <instance>sigmahal64</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -83,4 +76,10 @@
<instance>default</instance>
</interface>
</hal>
+ <vendor-ndk>
+ <version>32</version>
+ </vendor-ndk>
+ <system-sdk>
+ <version>31</version>
+ </system-sdk>
</compatibility-matrix>
diff --git a/manifest/framework_manifest.xml b/manifest/framework_manifest.xml
index 4804946..cf68c0a 100644
--- a/manifest/framework_manifest.xml
+++ b/manifest/framework_manifest.xml
@@ -26,14 +26,4 @@
<fqname>@1.0::ISystemEvent/default</fqname>
<fqname>@1.0::ISystemResource/default</fqname>
</hal>
- <hal format="hidl">
- <name>vendor.asus.bspcam</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IAsusBspCameraInterface</name>
- <instance>default</instance>
- </interface>
- <fqname>@1.0::IAsusBspCameraInterface/default</fqname>
- </hal>
</manifest>
\ No newline at end of file
diff --git a/manifest/manifest_lahaina.xml b/manifest/manifest_taro.xml
similarity index 88%
rename from manifest/manifest_lahaina.xml
rename to manifest/manifest_taro.xml
index 54c7a00..eb63402 100644
--- a/manifest/manifest_lahaina.xml
+++ b/manifest/manifest_taro.xml
@@ -1,28 +1,34 @@
<!--
Input:
- manifest_lahaina_sake.xml
+ manifest_taro.xml
+ netutil.xml
+ rttutil.xml
+ asus_hostapd.xml
+ sla.xml
+ glovemode.xml
+ zenmotion.xml
+ asusgeneral.xml
-->
-<manifest version="2.0" type="device" target-level="5">
- <kernel target-level="5"/>
+<manifest version="4.0" type="device" target-level="6">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
- <version>6.0</version>
+ <version>7.0</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
</interface>
- <fqname>@6.0::IDevicesFactory/default</fqname>
+ <fqname>@7.0::IDevicesFactory/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
- <version>6.0</version>
+ <version>7.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>
</interface>
- <fqname>@6.0::IEffectsFactory/default</fqname>
+ <fqname>@7.0::IEffectsFactory/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.bluetooth</name>
@@ -47,12 +53,12 @@
<hal format="hidl">
<name>android.hardware.camera.provider</name>
<transport>hwbinder</transport>
- <version>2.4</version>
+ <version>2.7</version>
<interface>
<name>ICameraProvider</name>
- <instance>legacy/0</instance>
+ <instance>legacy/1</instance>
</interface>
- <fqname>@2.4::ICameraProvider/legacy/0</fqname>
+ <fqname>@2.7::ICameraProvider/legacy/1</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.drm</name>
@@ -91,16 +97,6 @@
<fqname>@1.0::IOmxStore/default</fqname>
</hal>
<hal format="hidl">
- <name>android.hardware.memtrack</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IMemtrack</name>
- <instance>default</instance>
- </interface>
- <fqname>@1.0::IMemtrack/default</fqname>
- </hal>
- <hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
@@ -115,18 +111,18 @@
<transport>hwbinder</transport>
<fqname>@1.2::ISap/slot1</fqname>
<fqname>@1.2::ISap/slot2</fqname>
- <fqname>@1.5::IRadio/slot1</fqname>
- <fqname>@1.5::IRadio/slot2</fqname>
+ <fqname>@1.6::IRadio/slot1</fqname>
+ <fqname>@1.6::IRadio/slot2</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.radio.config</name>
<transport>hwbinder</transport>
- <version>1.1</version>
+ <version>1.3</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
</interface>
- <fqname>@1.1::IRadioConfig/default</fqname>
+ <fqname>@1.3::IRadioConfig/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.secure_element</name>
@@ -141,16 +137,6 @@
<fqname>@1.2::ISecureElement/SIM2</fqname>
</hal>
<hal format="hidl">
- <name>android.hardware.soundtrigger</name>
- <transport>hwbinder</transport>
- <version>2.3</version>
- <interface>
- <name>ISoundTriggerHw</name>
- <instance>default</instance>
- </interface>
- <fqname>@2.3::ISoundTriggerHw/default</fqname>
- </hal>
- <hal format="hidl">
<name>android.hardware.tetheroffload.config</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -163,12 +149,12 @@
<hal format="hidl">
<name>android.hardware.tetheroffload.control</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.1</version>
<interface>
<name>IOffloadControl</name>
<instance>default</instance>
</interface>
- <fqname>@1.0::IOffloadControl/default</fqname>
+ <fqname>@1.1::IOffloadControl/default</fqname>
</hal>
<hal format="hidl">
<name>com.dsi.ant</name>
@@ -221,6 +207,16 @@
<fqname>@2.1::IGoodixFingerprintDaemon/default</fqname>
</hal>
<hal format="hidl">
+ <name>vendor.ims.asusgeneralhidl</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IAsusGeneralHIDLE</name>
+ <instance>default</instance>
+ </interface>
+ <fqname>@1.0::IAsusGeneralHIDLE/default</fqname>
+ </hal>
+ <hal format="hidl">
<name>vendor.nxp.nxpnfc</name>
<transport>hwbinder</transport>
<version>2.0</version>
@@ -243,12 +239,12 @@
<hal format="hidl">
<name>vendor.qti.data.factory</name>
<transport>hwbinder</transport>
- <version>2.2</version>
+ <version>2.5</version>
<interface>
<name>IFactory</name>
<instance>default</instance>
</interface>
- <fqname>@2.2::IFactory/default</fqname>
+ <fqname>@2.5::IFactory/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.esepowermanager</name>
@@ -261,6 +257,16 @@
<fqname>@1.1::IEsePowerManager/default</fqname>
</hal>
<hal format="hidl">
+ <name>vendor.qti.hardware.AGMIPC</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IAGM</name>
+ <instance>default</instance>
+ </interface>
+ <fqname>@1.0::IAGM/default</fqname>
+ </hal>
+ <hal format="hidl">
<name>vendor.qti.hardware.alarm</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -311,6 +317,16 @@
<fqname>@1.0::IService/default</fqname>
</hal>
<hal format="hidl">
+ <name>vendor.qti.hardware.camera.aon</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IAONService</name>
+ <instance>aoncameraservice</instance>
+ </interface>
+ <fqname>@1.0::IAONService/aoncameraservice</fqname>
+ </hal>
+ <hal format="hidl">
<name>vendor.qti.hardware.camera.postproc</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -345,14 +361,14 @@
<hal format="hidl">
<name>vendor.qti.hardware.data.iwlan</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.1</version>
<interface>
<name>IIWlan</name>
<instance>slot1</instance>
<instance>slot2</instance>
</interface>
- <fqname>@1.0::IIWlan/slot1</fqname>
- <fqname>@1.0::IIWlan/slot2</fqname>
+ <fqname>@1.1::IIWlan/slot1</fqname>
+ <fqname>@1.1::IIWlan/slot2</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.data.latency</name>
@@ -365,6 +381,16 @@
<fqname>@1.0::ILinkLatency/default</fqname>
</hal>
<hal format="hidl">
+ <name>vendor.qti.hardware.dpmservice</name>
+ <transport>hwbinder</transport>
+ <version>1.1</version>
+ <interface>
+ <name>IDpmService</name>
+ <instance>DpmService</instance>
+ </interface>
+ <fqname>@1.1::IDpmService/DpmService</fqname>
+ </hal>
+ <hal format="hidl">
<name>vendor.qti.hardware.dsp</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -375,6 +401,16 @@
<fqname>@1.0::IDspService/dspservice</fqname>
</hal>
<hal format="hidl">
+ <name>vendor.qti.hardware.eid</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IEid</name>
+ <instance>default</instance>
+ </interface>
+ <fqname>@1.0::IEid/default</fqname>
+ </hal>
+ <hal format="hidl">
<name>vendor.qti.hardware.factory</name>
<transport>hwbinder</transport>
<version>1.1</version>
@@ -385,26 +421,6 @@
<fqname>@1.1::IFactory/default</fqname>
</hal>
<hal format="hidl">
- <name>vendor.qti.hardware.fm</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IFmHci</name>
- <instance>default</instance>
- </interface>
- <fqname>@1.0::IFmHci/default</fqname>
- </hal>
- <hal format="hidl">
- <name>vendor.qti.hardware.fstman</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IFstManager</name>
- <instance>default</instance>
- </interface>
- <fqname>@1.0::IFstManager/default</fqname>
- </hal>
- <hal format="hidl">
<name>vendor.qti.hardware.iop</name>
<transport>hwbinder</transport>
<version>2.0</version>
@@ -425,24 +441,24 @@
<fqname>@1.0::IMwqemAdapter/MwqemAdapter</fqname>
</hal>
<hal format="hidl">
- <name>vendor.qti.hardware.perf</name>
- <transport>hwbinder</transport>
- <version>2.2</version>
- <interface>
- <name>IPerf</name>
- <instance>default</instance>
- </interface>
- <fqname>@2.2::IPerf/default</fqname>
- </hal>
- <hal format="hidl">
- <name>vendor.qti.hardware.qconfig</name>
+ <name>vendor.qti.hardware.pal</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
- <name>IQConfig</name>
+ <name>IPAL</name>
<instance>default</instance>
</interface>
- <fqname>@1.0::IQConfig/default</fqname>
+ <fqname>@1.0::IPAL/default</fqname>
+ </hal>
+ <hal format="hidl">
+ <name>vendor.qti.hardware.qccvndhal</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IQccvndhal</name>
+ <instance>qccvndhal</instance>
+ </interface>
+ <fqname>@1.0::IQccvndhal/qccvndhal</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.qseecom</name>
@@ -482,18 +498,6 @@
<fqname>@1.0::IQcRilAudio/slot2</fqname>
</hal>
<hal format="hidl">
- <name>vendor.qti.hardware.radio.ims</name>
- <transport>hwbinder</transport>
- <version>1.7</version>
- <interface>
- <name>IImsRadio</name>
- <instance>imsradio0</instance>
- <instance>imsradio1</instance>
- </interface>
- <fqname>@1.7::IImsRadio/imsradio0</fqname>
- <fqname>@1.7::IImsRadio/imsradio1</fqname>
- </hal>
- <hal format="hidl">
<name>vendor.qti.hardware.radio.internal.deviceinfo</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -506,14 +510,14 @@
<hal format="hidl">
<name>vendor.qti.hardware.radio.lpa</name>
<transport>hwbinder</transport>
- <version>1.1</version>
+ <version>1.2</version>
<interface>
<name>IUimLpa</name>
<instance>UimLpa0</instance>
<instance>UimLpa1</instance>
</interface>
- <fqname>@1.1::IUimLpa/UimLpa0</fqname>
- <fqname>@1.1::IUimLpa/UimLpa1</fqname>
+ <fqname>@1.2::IUimLpa/UimLpa0</fqname>
+ <fqname>@1.2::IUimLpa/UimLpa1</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.radio.qcrilhook</name>
@@ -636,14 +640,14 @@
<fqname>@1.0::ITuiComm/default</fqname>
</hal>
<hal format="hidl">
- <name>vendor.qti.hardware.vpp</name>
+ <name>vendor.qti.hardware.wifi.wifilearner</name>
<transport>hwbinder</transport>
- <version>2.0</version>
+ <version>1.0</version>
<interface>
- <name>IHidlVppService</name>
- <instance>vppService</instance>
+ <name>IWifiStats</name>
+ <instance>wifiStats</instance>
</interface>
- <fqname>@2.0::IHidlVppService/vppService</fqname>
+ <fqname>@1.0::IWifiStats/wifiStats</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.wifidisplaysession</name>
@@ -684,11 +688,13 @@
<name>vendor.qti.ims.factory</name>
<transport>hwbinder</transport>
<version>1.1</version>
+ <version>2.1</version>
<interface>
<name>IImsFactory</name>
<instance>default</instance>
</interface>
<fqname>@1.1::IImsFactory/default</fqname>
+ <fqname>@2.1::IImsFactory/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.imsrtpservice</name>
@@ -701,6 +707,16 @@
<fqname>@3.0::IRTPService/imsrtpservice</fqname>
</hal>
<hal format="hidl">
+ <name>vendor.qti.qesdhal</name>
+ <transport>hwbinder</transport>
+ <version>1.1</version>
+ <interface>
+ <name>IQesdhal</name>
+ <instance>default</instance>
+ </interface>
+ <fqname>@1.1::IQesdhal/default</fqname>
+ </hal>
+ <hal format="hidl">
<name>vendor.qti.qspmhal</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -720,4 +736,5 @@
</interface>
<fqname>@1.0::ISlaService/default</fqname>
</hal>
+ <kernel target-level="6"/>
</manifest>
diff --git a/manifest/vendor_framework_compatibility_matrix.xml b/manifest/vendor_framework_compatibility_matrix.xml
index 4d8003e..84d847f 100644
--- a/manifest/vendor_framework_compatibility_matrix.xml
+++ b/manifest/vendor_framework_compatibility_matrix.xml
@@ -31,6 +31,7 @@
<interface>
<name>IEvsEnumerator</name>
<instance>default</instance>
+ <instance>hw/1</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
@@ -92,6 +93,14 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>com.android.ozoaudio.notify</name>
+ <version>1.0</version>
+ <interface>
+ <name>IOzoNotify</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>com.dsi.ant</name>
<version>1.0</version>
<interface>
@@ -187,11 +196,34 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.nxp.hardware.nfc</name>
- <version>1.0-1</version>
+ <name>vendor.ims.asusgeneralhidl</name>
+ <version>1.0</version>
+ <interface>
+ <name>IAsusGeneralHIDLE</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.nxp.eventprocessor</name>
+ <version>1.0</version>
+ <interface>
+ <name>INxpEseEvtProcessor</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.nxp.nxpese</name>
+ <version>1.0</version>
+ <interface>
+ <name>INxpEse</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.nxp.nxpnfc</name>
<version>2.0</version>
<interface>
- <name>INqNfc</name>
+ <name>INxpNfc</name>
<instance>default</instance>
</interface>
</hal>
@@ -230,7 +262,7 @@
<hal format="hidl" optional="true">
<name>vendor.qti.data.factory</name>
<version>1.0</version>
- <version>2.0-4</version>
+ <version>2.0-5</version>
<interface>
<name>IFactory</name>
<instance>default</instance>
@@ -245,6 +277,14 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.dvr</name>
+ <version>1.0</version>
+ <interface>
+ <name>IDvrDisplay</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.esepowermanager</name>
<version>1.0-1</version>
<interface>
@@ -337,7 +377,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.camera.aon</name>
- <version>1.0</version>
+ <version>1.0-1</version>
<interface>
<name>IAONService</name>
<instance>aoncameraservice</instance>
@@ -384,6 +424,14 @@
<instance>slot2</instance>
</interface>
</hal>
+ <hal format="aidl" optional="true">
+ <name>vendor.qti.hardware.data.connectionfactory</name>
+ <interface>
+ <name>IFactory</name>
+ <instance>slot0</instance>
+ <instance>slot1</instance>
+ </interface>
+ </hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.data.iwlan</name>
<version>1.0-1</version>
@@ -431,6 +479,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.qti.hardware.display.config</name>
+ <version>1-5</version>
<interface>
<name>IDisplayConfig</name>
<instance>default</instance>
@@ -457,7 +506,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.dpmservice</name>
- <version>1.0</version>
+ <version>1.0-1</version>
<interface>
<name>IDpmService</name>
<instance>DpmService</instance>
@@ -480,14 +529,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.hardware.embmssl</name>
- <version>1.0-1</version>
- <interface>
- <name>IEmbms</name>
- <instance>embmsslServer0</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.qti.hardware.factory</name>
<version>1.0-1</version>
<interface>
@@ -584,6 +625,22 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.qccsyshal</name>
+ <version>1.0-1</version>
+ <interface>
+ <name>IQccsyshal</name>
+ <instance>qccsyshal</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
+ <name>vendor.qti.hardware.qccvndhal</name>
+ <version>1.0</version>
+ <interface>
+ <name>IQccvndhal</name>
+ <instance>qccvndhal</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.hardware.qconfig</name>
<version>1.0</version>
<interface>
@@ -682,6 +739,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.qti.hardware.radio.ims</name>
+ <version>1-6</version>
<interface>
<name>IImsRadio</name>
<instance>imsradio0</instance>
@@ -698,7 +756,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.qti.hardware.radio.lpa</name>
- <version>1.0-1</version>
+ <version>1.0-2</version>
<interface>
<name>IUimLpa</name>
<instance>UimLpa0</instance>
@@ -726,6 +784,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.qti.hardware.radio.qtiradio</name>
+ <version>1-5</version>
<interface>
<name>IQtiRadioStable</name>
<instance>slot1</instance>
@@ -974,7 +1033,7 @@
<hal format="hidl" optional="true">
<name>vendor.qti.ims.factory</name>
<version>1.0-1</version>
- <version>2.0</version>
+ <version>2.0-1</version>
<interface>
<name>IImsFactory</name>
<instance>default</instance>
@@ -997,6 +1056,14 @@
</interface>
</hal>
<hal format="hidl" optional="true">
+ <name>vendor.qti.qesdhal</name>
+ <version>1.0-1</version>
+ <interface>
+ <name>IQesdhal</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl" optional="true">
<name>vendor.qti.qspmhal</name>
<version>1.0</version>
<interface>
@@ -1013,14 +1080,6 @@
</interface>
</hal>
<hal format="hidl" optional="true">
- <name>vendor.qti.spu</name>
- <version>1.0-1</version>
- <interface>
- <name>ISPUManager</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
<name>vendor.qti.voiceprint</name>
<version>1.0</version>
<interface>
@@ -1028,31 +1087,4 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="true">
- <name>vendor.asus.wifi.hostapd</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IAsusHostapd</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
- <name>vendor.nxp.nxpnfc</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>INxpNfc</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl" optional="true">
- <name>vendor.nxp.nxpnfclegacy</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>INxpNfcLegacy</name>
- <instance>default</instance>
- </interface>
- </hal>
</compatibility-matrix>