From 57f771d49df45c5766b02bdac09f60d0d67d303c Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Wed, 26 Apr 2023 18:49:51 +0000 Subject: [PATCH] Fix Visualizer and Volume type UUID Bug: b/279432911 Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit Change-Id: I3e7d145aa37fb67d78cf05c06da22f74c0ea07ad --- audio/aidl/aidl_api/android.hardware.audio.effect/1/.hash | 2 +- .../1/android/hardware/audio/effect/Descriptor.aidl | 4 ++-- .../current/android/hardware/audio/effect/Descriptor.aidl | 4 ++-- audio/aidl/android/hardware/audio/effect/Descriptor.aidl | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/1/.hash b/audio/aidl/aidl_api/android.hardware.audio.effect/1/.hash index 9914460874..b71ab296ef 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/1/.hash +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/1/.hash @@ -1 +1 @@ -504db4349f884424a8acc3f2fc0f6bb74dbfcdf0 +34b618a587cb9977ee0cd13b173e699d2dcdb320 diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/1/android/hardware/audio/effect/Descriptor.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/1/android/hardware/audio/effect/Descriptor.aidl index 82dae97d24..115da1db57 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/1/android/hardware/audio/effect/Descriptor.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/1/android/hardware/audio/effect/Descriptor.aidl @@ -50,8 +50,8 @@ parcelable Descriptor { const String EFFECT_TYPE_UUID_PRESET_REVERB = "47382d60-ddd8-11db-bf3a-0002a5d5c51b"; const String EFFECT_TYPE_UUID_SPATIALIZER = "ccd4cf09-a79d-46c2-9aae-06a1698d6c8f"; const String EFFECT_TYPE_UUID_VIRTUALIZER = "37cc2c00-dddd-11db-8577-0002a5d5c51b"; - const String EFFECT_TYPE_UUID_VISUALIZER = "d069d9e0-8329-11df-9168-0002a5d5c51b"; - const String EFFECT_TYPE_UUID_VOLUME = "fa81a2b8-588b-11ed-9b6a-0242ac120002"; + const String EFFECT_TYPE_UUID_VISUALIZER = "e46b26a0-dddd-11db-8afd-0002a5d5c51b"; + const String EFFECT_TYPE_UUID_VOLUME = "09e8ede0-ddde-11db-b4f6-0002a5d5c51b"; @VintfStability parcelable Identity { android.media.audio.common.AudioUuid type; diff --git a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Descriptor.aidl b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Descriptor.aidl index 82dae97d24..115da1db57 100644 --- a/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Descriptor.aidl +++ b/audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Descriptor.aidl @@ -50,8 +50,8 @@ parcelable Descriptor { const String EFFECT_TYPE_UUID_PRESET_REVERB = "47382d60-ddd8-11db-bf3a-0002a5d5c51b"; const String EFFECT_TYPE_UUID_SPATIALIZER = "ccd4cf09-a79d-46c2-9aae-06a1698d6c8f"; const String EFFECT_TYPE_UUID_VIRTUALIZER = "37cc2c00-dddd-11db-8577-0002a5d5c51b"; - const String EFFECT_TYPE_UUID_VISUALIZER = "d069d9e0-8329-11df-9168-0002a5d5c51b"; - const String EFFECT_TYPE_UUID_VOLUME = "fa81a2b8-588b-11ed-9b6a-0242ac120002"; + const String EFFECT_TYPE_UUID_VISUALIZER = "e46b26a0-dddd-11db-8afd-0002a5d5c51b"; + const String EFFECT_TYPE_UUID_VOLUME = "09e8ede0-ddde-11db-b4f6-0002a5d5c51b"; @VintfStability parcelable Identity { android.media.audio.common.AudioUuid type; diff --git a/audio/aidl/android/hardware/audio/effect/Descriptor.aidl b/audio/aidl/android/hardware/audio/effect/Descriptor.aidl index 2fbc401f0f..b152f76d74 100644 --- a/audio/aidl/android/hardware/audio/effect/Descriptor.aidl +++ b/audio/aidl/android/hardware/audio/effect/Descriptor.aidl @@ -96,11 +96,11 @@ parcelable Descriptor { /** * UUID for visualizer effect type. */ - const String EFFECT_TYPE_UUID_VISUALIZER = "d069d9e0-8329-11df-9168-0002a5d5c51b"; + const String EFFECT_TYPE_UUID_VISUALIZER = "e46b26a0-dddd-11db-8afd-0002a5d5c51b"; /** * UUID for Volume effect type. */ - const String EFFECT_TYPE_UUID_VOLUME = "fa81a2b8-588b-11ed-9b6a-0242ac120002"; + const String EFFECT_TYPE_UUID_VOLUME = "09e8ede0-ddde-11db-b4f6-0002a5d5c51b"; /** * This structure completely identifies an effect implementation.