commit ea068bf33f651470352259f58d771c55f3719bde
author Ziyang Cheng <ziyangch@google.com> Mon Jul 22 18:20:45 2024 +0000
committer Ziyang Cheng <ziyangch@google.com> Mon Jul 22 18:48:41 2024 +0000
tree 5f66ae2c8088a92ff992e639280952279f2649c5
parent f63654086d7f91890d8afc5987c41a8cd5fe6a73

Add vendor UUID not null check in GenericSoundModel.

Bug: 339267254
Flag: NONE bugfix
Test: Build image for Pixel Watch devices.
Change-Id: I93ac96483fbc415264ae42b1351fd3fe0e01b90e

core/java/android/hardware/soundtrigger/SoundTrigger.java

diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java
index bfff4db..bf7f3f4 100644
--- a/core/java/android/hardware/soundtrigger/SoundTrigger.java
+++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java
@@ -892,7 +892,8 @@
 
         public GenericSoundModel(@NonNull UUID uuid, @NonNull UUID vendorUuid,
                 @Nullable byte[] data, int version) {
-            super(uuid, vendorUuid, TYPE_GENERIC_SOUND, data, version);
+            super(uuid, Objects.requireNonNull(vendorUuid, "vendorUuid cannot be null"),
+                    TYPE_GENERIC_SOUND, data, version);
         }
 
         @UnsupportedAppUsage