Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb72854b authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Fix Visualizer and Volume type UUID" into udc-dev am: 3600a24b am: ad6b1127 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22895140



Change-Id: Ifcb3fdfb02488cb1aff72bc4e126502432b54d98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7f59e2b ad6b1127

audio/aidl/aidl_api/android.hardware.audio.effect/1/.hash

+1 −1
Original line number Diff line number Diff line 
504db4349f884424a8acc3f2fc0f6bb74dbfcdf0
 
34b618a587cb9977ee0cd13b173e699d2dcdb320

audio/aidl/aidl_api/android.hardware.audio.effect/1/android/hardware/audio/effect/Descriptor.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Descriptor.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;

audio/aidl/android/hardware/audio/effect/Descriptor.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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.