diff --git a/Android.bp b/Android.bp index fc6babe6ad..baf3291f60 100644 --- a/Android.bp +++ b/Android.bp @@ -63,8 +63,8 @@ cc_defaults { "libbase", // All the following are dependencies of any HAL definition library. "libcutils", - "liblog", "libhidlbase", + "liblog", "libutils", ], cflags: [ diff --git a/audio/aidl/Android.bp b/audio/aidl/Android.bp index 8bb8cd5612..f9e3eb410f 100644 --- a/audio/aidl/Android.bp +++ b/audio/aidl/Android.bp @@ -44,7 +44,7 @@ aidl_interface { "android/hardware/audio/common/SinkMetadata.aidl", "android/hardware/audio/common/SourceMetadata.aidl", ], - frozen: true, + frozen: false, backend: { cpp: { enabled: true, @@ -86,7 +86,7 @@ aidl_interface { } // Note: This should always be one version ahead of the last frozen version -latest_android_hardware_audio_common = "android.hardware.audio.common-V3" +latest_android_hardware_audio_common = "android.hardware.audio.common-V4" // Modules that depend on android.hardware.audio.common directly can include // the following cc_defaults to avoid explicitly managing dependency versions @@ -188,11 +188,11 @@ aidl_interface { // IMPORTANT: Update latest_android_hardware_audio_core every time you // add the latest frozen version to versions_with_info ], - frozen: true, + frozen: false, } // Note: This should always be one version ahead of the last frozen version -latest_android_hardware_audio_core = "android.hardware.audio.core-V2" +latest_android_hardware_audio_core = "android.hardware.audio.core-V3" // Modules that depend on android.hardware.audio.core directly can include // the following cc_defaults to avoid explicitly managing dependency versions @@ -250,11 +250,11 @@ aidl_interface { // IMPORTANT: Update latest_android_hardware_audio_core_sounddose every time you // add the latest frozen version to versions_with_info ], - frozen: true, + frozen: false, } // Note: This should always be one version ahead of the last frozen version -latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V2" +latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V3" // Modules that depend on android.hardware.audio.core.sounddose directly can include // the following cc_defaults to avoid explicitly managing dependency versions @@ -358,11 +358,11 @@ aidl_interface { }, ], - frozen: true, + frozen: false, } -latest_android_hardware_audio_effect = "android.hardware.audio.effect-V2" +latest_android_hardware_audio_effect = "android.hardware.audio.effect-V3" cc_defaults { name: "latest_android_hardware_audio_effect_ndk_shared", diff --git a/audio/aidl/default/android.hardware.audio.service-aidl.xml b/audio/aidl/default/android.hardware.audio.service-aidl.xml index 5278e4f147..27f48e223c 100644 --- a/audio/aidl/default/android.hardware.audio.service-aidl.xml +++ b/audio/aidl/default/android.hardware.audio.service-aidl.xml @@ -1,39 +1,39 @@ android.hardware.audio.core - 2 + 3 IModule/default android.hardware.audio.core - 2 + 3 IModule/r_submix android.hardware.audio.core - 2 + 3 IModule/bluetooth android.hardware.audio.core - 2 + 3 IConfig/default android.hardware.audio.effect - 2 + 3 IFactory/default diff --git a/audio/aidl/sounddose/Android.bp b/audio/aidl/sounddose/Android.bp index de3ed64186..8b2d74bf8b 100644 --- a/audio/aidl/sounddose/Android.bp +++ b/audio/aidl/sounddose/Android.bp @@ -56,11 +56,11 @@ aidl_interface { // IMPORTANT: Update latest_android_hardware_audio_sounddose every time you // add the latest frozen version to versions_with_info ], - frozen: true, + frozen: false, } // Note: This should always be one version ahead of the last frozen version -latest_android_hardware_audio_sounddose = "android.hardware.audio.sounddose-V2" +latest_android_hardware_audio_sounddose = "android.hardware.audio.sounddose-V3" // Modules that depend on android.hardware.audio.sounddose directly can include // the following cc_defaults to avoid explicitly managing dependency versions diff --git a/automotive/audiocontrol/aidl/Android.bp b/automotive/audiocontrol/aidl/Android.bp index bedf5e4a96..4fc6aac395 100644 --- a/automotive/audiocontrol/aidl/Android.bp +++ b/automotive/audiocontrol/aidl/Android.bp @@ -59,12 +59,12 @@ aidl_interface { }, ], - frozen: true, + frozen: false, } // Note: This should always be one version ahead of the last frozen version -latest_android_hardware_automotive_audiocontrol = "android.hardware.automotive.audiocontrol-V4" +latest_android_hardware_automotive_audiocontrol = "android.hardware.automotive.audiocontrol-V5" cc_defaults { name: "latest_android_hardware_automotive_audiocontrol_cpp_static", diff --git a/bluetooth/audio/aidl/Android.bp b/bluetooth/audio/aidl/Android.bp index f273c7aa85..ae55fa92bc 100644 --- a/bluetooth/audio/aidl/Android.bp +++ b/bluetooth/audio/aidl/Android.bp @@ -85,12 +85,12 @@ aidl_interface { }, ], - frozen: true, + frozen: false, } // Note: This should always be one version ahead of the last frozen version -latest_android_hardware_bluetooth_audio = "android.hardware.bluetooth.audio-V4" +latest_android_hardware_bluetooth_audio = "android.hardware.bluetooth.audio-V5" cc_defaults { name: "latest_android_hardware_bluetooth_audio_ndk_shared", diff --git a/bluetooth/audio/aidl/default/bluetooth_audio.xml b/bluetooth/audio/aidl/default/bluetooth_audio.xml index 3561dd1328..767bf8fc92 100644 --- a/bluetooth/audio/aidl/default/bluetooth_audio.xml +++ b/bluetooth/audio/aidl/default/bluetooth_audio.xml @@ -1,7 +1,7 @@ android.hardware.bluetooth.audio - 4 + 5 IBluetoothAudioProviderFactory/default diff --git a/compatibility_matrices/compatibility_matrix.202504.xml b/compatibility_matrices/compatibility_matrix.202504.xml index 62756bdc31..3fd762a2f1 100644 --- a/compatibility_matrices/compatibility_matrix.202504.xml +++ b/compatibility_matrices/compatibility_matrix.202504.xml @@ -1,7 +1,7 @@ android.hardware.audio.core - 1-2 + 1-3 IModule default @@ -20,7 +20,7 @@ android.hardware.audio.effect - 1-2 + 1-3 IFactory default @@ -28,7 +28,7 @@ android.hardware.audio.sounddose - 1-2 + 1-3 ISoundDoseFactory default @@ -44,7 +44,7 @@ android.hardware.automotive.audiocontrol - 2-4 + 2-5 IAudioControl default @@ -132,7 +132,7 @@ android.hardware.bluetooth.audio - 3-4 + 3-5 IBluetoothAudioProviderFactory default @@ -541,7 +541,7 @@ android.hardware.soundtrigger3 - 1-2 + 1-3 ISoundTriggerHw default diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp index 08ef49b4a9..fca9e1c823 100644 --- a/compatibility_matrices/exclude/fcm_exclude.cpp +++ b/compatibility_matrices/exclude/fcm_exclude.cpp @@ -164,6 +164,7 @@ bool ShouldCheckMissingAidlHalsInFcm(const std::string& packageAndVersion) { // AIDL "android.hardware.audio.core.sounddose@1", "android.hardware.audio.core.sounddose@2", + "android.hardware.audio.core.sounddose@3", // Deprecated HALs. "android.hardware.bluetooth.audio@1", diff --git a/soundtrigger/aidl/Android.bp b/soundtrigger/aidl/Android.bp index af9a5fc41d..b8b69153fb 100644 --- a/soundtrigger/aidl/Android.bp +++ b/soundtrigger/aidl/Android.bp @@ -35,7 +35,7 @@ aidl_interface { sdk_version: "module_current", }, }, - frozen: true, + frozen: false, versions_with_info: [ { version: "1", @@ -52,7 +52,7 @@ aidl_interface { } // Note: This should always be one version ahead of the last frozen version -latest_android_hardware_soundtrigger3 = "android.hardware.soundtrigger3-V2" +latest_android_hardware_soundtrigger3 = "android.hardware.soundtrigger3-V3" // Modules that depend on android.hardware.soundtrigger3 directly can include // the following java_defaults to avoid explicitly managing dependency versions