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

Commit 05881597 authored by Daniel Chapin's avatar Daniel Chapin Committed by Android Build Coastguard Worker
Browse files

Revert "Add vendor UUID not null check in GenericSoundModel." 

Revert submission 27302583

Reason for revert: Droidfood blocking bug: b/356041583

Reverted changes: /q/submissionid:27302583
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:63cd5557c9659db326b725d26946a30d60473f79)
Merged-In: I6d02467fab7d9f8cdfb6d87a037eccffe59b0538
Change-Id: I6d02467fab7d9f8cdfb6d87a037eccffe59b0538
parent a69033eb

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

+1 −2
Original line number Diff line number Diff line
@@ -892,8 +892,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);

        }



        @UnsupportedAppUsage