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

Commit 717d5097 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28532007'] into 24Q4-release. 

Change-Id: I4b15024e0168bd1b22c18faead39d4e72817bb99
parents f19b9367 a80fe057

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

+1 −2
Original line number Diff line number Diff line
@@ -900,8 +900,7 @@ public class SoundTrigger { 
         */

        public GenericSoundModel(@NonNull UUID uuid, @NonNull UUID vendorUuid,

                @Nullable byte[] data, int version) {

            super(uuid, Objects.requireNonNull(vendorUuid, "vendorUuid cannot be null"),

                    TYPE_GENERIC_SOUND, data, version);

            super(uuid, vendorUuid, TYPE_GENERIC_SOUND, data, version);

        }



        /**