Android 15.0.0 Release 6 (AP4A.241205.013)

-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
 eNGxAKCRv3bjgHcOEQjVsHW2ngqYmpsq4QCfejuzhueEquVmLXY/t6cNVe/FF4A=
 =6wuL
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7DcXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnjOg/+NeluPk0Ydoz47zbXHKNPD7Mr
 Q2VybclFjaNIbmmtQwNYx/95S0clX+aoAyS9/WFAMpKpNVhKWWMBy1UXDtZlEka5
 BA7FeJyb//ba5skMdrTxLfGtReTPzr8OcUh/F/1U+KT77uMnUX71Yq7oOrsnLSen
 Ij4bSMF3q1KWuR/xmLmJIl7t+u+bp2pHP1fteu2twJmz1ncbWTw6OxUl5VCquqsN
 BdbF2gCR4abVE7jJD6VEJS9nwJcXoa1gdt4y9ARDBMkcRQxvRES1p5Ezz32dSwgt
 F5VfXwydre2fTVL6VxMXHVcTVig0TAlkpa1Inuu94ElQg6mVK5sGh7ZwhE+gCZ4P
 wrElzU6mFc61VfFEdAnXkFHOW+eFw4FC5yiPhJjxqLbge8FBeVZczE9Fqhu/UxPu
 fA3taBNLchVb/qvl/WQtwI8HJz6kcoMFs2+WHak89PP9PLzBtC9YxtJQBKPXZLQt
 p3jk8+zEyRTFJMIyvKdscHjUYoWvmUHsmPNgGccSWRxPrIB6SPbGYyVDny+43Q1I
 StqVesNw55fqq68eIZWNwqm0w+EtVzvt8e6SFYx4of6nnr4S+xtAjbJ+MEhsusRk
 /IVblc3tkJ+WtiIUZQShbs0aMquOSpcS6dfT3uf+6i3fEp+mfCYMRa+OK3Xse8/U
 0VrOzjzNkfNvto5FJAw=
 =IoQL
 -----END PGP SIGNATURE-----

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
# eNGxAKCRv3bjgHcOEQjVsHW2ngqYmpsq4QCfejuzhueEquVmLXY/t6cNVe/FF4A=
# =6wuL
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:01 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2483 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By James Huang (8) and others
# Via Android Build Coastguard Worker (62) and others
* tag 'android-15.0.0_r6': (92 commits)
  gps: Update official release 4.15.3_7_241024_R1 config on CT3
  powerhint: enable auto_prefer_idle in games
  powerhint: port dvfs_headroom settings from p24
  powerhint.json: enable gpu capacity signalling.
  comet: fix unexpected affinity setting.
  Adjust power button y value for light reveal
  Add Sony WF-1000XM5 to the LE audio allow list
  Display: Removed colordata calibration file from /device
  BT Offload: Using origin flag to control BT Offload feature
  bthal: disable thread dispatcher
  comet: Update APMg3 tuning files
  Add UWB overlay to comet device
  gps: Update L5 Path Delay Parameters for CT3
  comet: Update APMg3 tuning files
  comet: fix bypass mode creation flow
  Revert^2 "Move PRODUCT_SHIPPING_API_LEVEL to define by device"
  Enable STResetTool on P24
  gps: Update official release 4.15.3_6_240905_R2 config
  add support for bluetooth-low-energy-broadcast
  thread: disable hal service
  ...

 Conflicts:
	device-comet.mk
	location/user/gps.cfg
	location/userdebug/gps.cfg
	powerhint-comet.json

Change-Id: Ic7869348c2d27a7da92371b1f1e3f3728d103460

audio/comet/aidl_config/audio_platform_configuration.xml

@@ -69,7 +69,7 @@
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="Extensions" value="WavesNx,SpeakerPowerLinkLaw" />
     </tuner>
-    <tuner type="telephony" name="fortemedia">
+    <tuner type="telephony" name="fmapmg3hybrid">
       <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
       <argument name="VoIP_Rate" value="32000" />
       <argument name="BOOST_USB_SWB_CLK" value="y" />

audio/comet/aidl_config/mixer_paths_aidl.xml

@@ -318,6 +318,7 @@
   <ctl name="Incall Capture Stream0" value="Off" />
   <ctl name="Incall Capture Stream1" value="Off" />
   <ctl name="Incall Capture Stream2" value="Off" />
+  <ctl name="Incall Capture Stream3" value="Off" />
 
   <!-- These two controls control the muting function of mics and sinks during the voice call. -->
   <!-- They would be enabled by HAL. -->
@@ -425,6 +426,10 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -497,6 +502,10 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -569,6 +578,10 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -646,6 +659,10 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -718,6 +735,10 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -802,6 +823,10 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -862,6 +887,10 @@
     <path name="immersive-playback -> bt" />
   </path>
 
+  <path name="immersive-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="immersive-playback -> bt" />
+  </path>
+
   <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
@@ -930,6 +959,10 @@
     <path name="spatializer-offload-playback -> bt" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
@@ -1000,6 +1033,10 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1074,6 +1111,39 @@
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -1177,6 +1247,10 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>

audio/comet/audio-tables.mk

@@ -65,7 +65,26 @@ PRODUCT_PACKAGES += \
     compens_spk_l_1.conf \
     compens_spk_l_2.conf \
     compens_spk_r_1.conf \
-    compens_spk_r_2.conf
+    compens_spk_r_2.conf \
+    downlink_bluetooth_headset_config.pb \
+    downlink_dock_config.pb \
+    downlink_external_speaker_config.pb \
+    downlink_handset_config.pb \
+    downlink_speaker_config.pb \
+    downlink_wired_headset_config.pb \
+    uplink_bluetooth_headset_aec_off_config.pb \
+    uplink_bluetooth_headset_aec_on_config.pb \
+    uplink_dock_aec_off_config.pb \
+    uplink_dock_aec_on_config.pb \
+    uplink_external_speaker_aec_off_config.pb \
+    uplink_external_speaker_aec_on_config.pb \
+    uplink_handset_aec_off_config.pb \
+    uplink_handset_aec_on_config.pb \
+    uplink_speaker_aec_off_config.pb \
+    uplink_speaker_aec_on_config.pb \
+    uplink_wired_headset_aec_off_config.pb \
+    uplink_wired_headset_aec_on_config.pb
+
 
 # eng specific
 PRODUCT_PACKAGES_ENG += \
@@ -76,7 +95,8 @@ PRODUCT_PACKAGES_ENG += \
     template.xml \
     tuning_constraints_combination.xml \
     test_config.ini \
-    test_preset.mps
+    test_preset.mps \
+    speaker_post_processing_volume_spec.xml
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal

audio/comet/prebuilt/libspeechenhancer/Android.bp

@@ -34,7 +34,9 @@ cc_prebuilt_library_shared {
         "libcutils",
         "libEGL",
         "libGLESv2",
+        "libbinder_ndk",
         "liblog",
+        "libsync",
         "libz",
         "libnativewindow",
     ],

audio/comet/tuning/Android.bp

@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 soong_namespace {}
 
 package {
@@ -131,6 +132,114 @@ prebuilt_etc {
     defaults: ["aoc_defaults"],
 }
 
+prebuilt_etc {
+    name: "downlink_bluetooth_headset_config.pb",
+    src: "apmg3/downlink_bluetooth_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_dock_config.pb",
+    src: "apmg3/downlink_dock_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_external_speaker_config.pb",
+    src: "apmg3/downlink_external_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_handset_config.pb",
+    src: "apmg3/downlink_handset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_speaker_config.pb",
+    src: "apmg3/downlink_speaker_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "downlink_wired_headset_config.pb",
+    src: "apmg3/downlink_wired_headset_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_off_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_bluetooth_headset_aec_on_config.pb",
+    src: "apmg3/uplink_bluetooth_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_off_config.pb",
+    src: "apmg3/uplink_dock_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_dock_aec_on_config.pb",
+    src: "apmg3/uplink_dock_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_external_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_external_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_off_config.pb",
+    src: "apmg3/uplink_handset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_handset_aec_on_config.pb",
+    src: "apmg3/uplink_handset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_off_config.pb",
+    src: "apmg3/uplink_speaker_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_speaker_aec_on_config.pb",
+    src: "apmg3/uplink_speaker_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_off_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_off_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+    name: "uplink_wired_headset_aec_on_config.pb",
+    src: "apmg3/uplink_wired_headset_aec_on_config.pb",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "waves_config.ini",
     src: "waves/waves_config.ini",
@@ -143,6 +252,12 @@ prebuilt_etc {
     soc_specific: true,
 }
 
+prebuilt_etc {
+    name: "speaker_post_processing_volume_spec.xml",
+    src: "pts/speaker_post_processing_volume_spec.xml",
+    defaults: ["aoc_defaults"],
+}
+
 prebuilt_etc {
     name: "waves_config_nx.ini",
     src: "waves/waves_config_nx.ini",

audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" ?>
+<xml>
+    <spec feature="normal" device_state="OPENED">
+        <vol step="1">-55.3429,-56.462852</vol>
+        <vol step="2">-51.476486,-52.629974</vol>
+        <vol step="3">-47.429344,-48.577915</vol>
+        <vol step="4">-44.404938,-45.54104</vol>
+        <vol step="5">-41.34484,-42.47274</vol>
+        <vol step="6">-38.26381,-39.386524</vol>
+        <vol step="7">-35.17891,-36.297333</vol>
+        <vol step="8">-32.07109,-33.184692</vol>
+        <vol step="9">-30.30139,-31.407984</vol>
+        <vol step="10">-28.531578,-29.626408</vol>
+        <vol step="11">-26.762623,-27.840538</vol>
+        <vol step="12">-24.994268,-26.05007</vol>
+        <vol step="13">-23.22528,-24.253963</vol>
+        <vol step="14">-21.460478,-22.458183</vol>
+        <vol step="15">-19.69938,-20.66309</vol>
+        <vol step="16">-17.927505,-18.85597</vol>
+        <vol step="17">-16.149855,-17.04668</vol>
+        <vol step="18">-14.375043,-15.242476</vol>
+        <vol step="19">-12.619692,-13.460893</vol>
+        <vol step="20">-10.988443,-11.807947</vol>
+        <vol step="21">-10.229917,-11.031332</vol>
+        <vol step="22">-10.067055,-10.8566475</vol>
+        <vol step="23">-10.010124,-10.794648</vol>
+        <vol step="24">-9.965792,-10.748672</vol>
+        <vol step="25">-9.924187,-10.708454</vol>
+    </spec>
+
+    <spec feature="normal" device_state="CLOSED">
+        <vol step="1">-56.824966,-56.22085</vol>
+        <vol step="2">-53.00812,-52.39601</vol>
+        <vol step="3">-48.99447,-48.376297</vol>
+        <vol step="4">-45.98986,-45.365585</vol>
+        <vol step="5">-42.94967,-42.31531</vol>
+        <vol step="6">-39.888924,-39.239597</vol>
+        <vol step="7">-36.825584,-36.154556</vol>
+        <vol step="8">-33.740566,-33.03967</vol>
+        <vol step="9">-31.983803,-31.262745</vol>
+        <vol step="10">-30.226,-29.482727</vol>
+        <vol step="11">-28.46655,-27.69943</vol>
+        <vol step="12">-26.707556,-25.915329</vol>
+        <vol step="13">-24.945498,-24.127829</vol>
+        <vol step="14">-23.18879,-22.34605</vol>
+        <vol step="15">-21.434853,-20.568602</vol>
+        <vol step="16">-19.676136,-18.789795</vol>
+        <vol step="17">-17.923016,-17.019646</vol>
+        <vol step="18">-16.179115,-15.263374</vol>
+        <vol step="19">-14.411232,-13.477808</vol>
+        <vol step="20">-12.608496,-11.657543</vol>
+        <vol step="21">-11.418643,-10.450487</vol>
+        <vol step="22">-11.115015,-10.132849</vol>
+        <vol step="23">-11.049253,-10.054632</vol>
+        <vol step="24">-11.009314,-10.004243</vol>
+        <vol step="25">-10.979197,-9.964965</vol>
+    </spec>
+
+    <spec feature="speaker_spatialization" device_state="OPENED">
+        <vol step="1">-48.656296,-50.673286</vol>
+        <vol step="2">-44.69299,-46.81315</vol>
+        <vol step="3">-40.618153,-42.763763</vol>
+        <vol step="4">-37.65023,-39.806267</vol>
+        <vol step="5">-34.71226,-36.89866</vol>
+        <vol step="6">-31.792694,-34.008415</vol>
+        <vol step="7">-28.87659,-31.105488</vol>
+        <vol step="8">-25.919016,-28.141272</vol>
+        <vol step="9">-24.223642,-26.43234</vol>
+        <vol step="10">-22.520838,-24.709074</vol>
+        <vol step="11">-20.81106,-22.973286</vol>
+        <vol step="12">-19.082249,-21.21807</vol>
+        <vol step="13">-17.333406,-19.4436</vol>
+        <vol step="14">-15.581524,-17.667053</vol>
+        <vol step="15">-13.825251,-15.887933</vol>
+        <vol step="16">-12.092208,-14.131317</vol>
+        <vol step="17">-10.732493,-12.741249</vol>
+        <vol step="18">-10.100718,-12.073996</vol>
+        <vol step="19">-9.911014,-11.864244</vol>
+        <vol step="20">-9.836917,-11.782432</vol>
+        <vol step="21">-9.779734,-11.722244</vol>
+        <vol step="22">-9.734992,-11.677365</vol>
+        <vol step="23">-9.6985,-11.645135</vol>
+        <vol step="24">-9.66777,-11.623802</vol>
+        <vol step="25">-9.63527,-11.600014</vol>
+    </spec>
+
+    <spec feature="speaker_spatialization" device_state="CLOSED">
+        <vol step="1">-51.52192,-50.394104</vol>
+        <vol step="2">-47.673805,-46.551804</vol>
+        <vol step="3">-43.651005,-42.548542</vol>
+        <vol step="4">-40.702824,-39.619167</vol>
+        <vol step="5">-37.78776,-36.72528</vol>
+        <vol step="6">-34.883675,-33.843998</vol>
+        <vol step="7">-31.96994,-30.95195</vol>
+        <vol step="8">-29.008202,-28.005291</vol>
+        <vol step="9">-27.310637,-26.311722</vol>
+        <vol step="10">-25.606598,-24.60886</vol>
+        <vol step="11">-23.898502,-22.899467</vol>
+        <vol step="12">-22.189236,-21.187288</vol>
+        <vol step="13">-20.478073,-19.472952</vol>
+        <vol step="14">-18.775997,-17.768572</vol>
+        <vol step="15">-17.08199,-16.07426</vol>
+        <vol step="16">-15.326209,-14.307854</vol>
+        <vol step="17">-13.593147,-12.561827</vol>
+        <vol step="18">-12.172909,-11.130552</vol>
+        <vol step="19">-11.557884,-10.508577</vol>
+        <vol step="20">-11.353183,-10.2964</vol>
+        <vol step="21">-11.280718,-10.217085</vol>
+        <vol step="22">-11.227874,-10.15811</vol>
+        <vol step="23">-11.186886,-10.110628</vol>
+        <vol step="24">-11.15273,-10.070196</vol>
+        <vol step="25">-11.126692,-10.037739</vol>
+    </spec>
+</xml>