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

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

Revert "Expose GenericSoundModel as SystemApi." 

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:4270253d7b317a5bf7a4b7dd72f1e698ff121859)
Merged-In: Ib663714d09ebcd5f3dfed3f9bf1884acafcd0980
Change-Id: Ib663714d09ebcd5f3dfed3f9bf1884acafcd0980
parent 717d5097

core/api/system-current.txt

+0 −8
Original line number Diff line number Diff line
@@ -6718,14 +6718,6 @@ package android.hardware.soundtrigger { 
    field public static final int STATUS_OK = 0; // 0x0

  }













  @FlaggedApi("android.media.soundtrigger.sound_trigger_generic_model_api") public static final class SoundTrigger.GenericSoundModel extends android.hardware.soundtrigger.SoundTrigger.SoundModel implements android.os.Parcelable {













    ctor public SoundTrigger.GenericSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[], int);













    ctor public SoundTrigger.GenericSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[]);













    method public int describeContents();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.SoundTrigger.GenericSoundModel> CREATOR;













  }



























  public static final class SoundTrigger.Keyphrase implements android.os.Parcelable {















    ctor public SoundTrigger.Keyphrase(int, int, @NonNull java.util.Locale, @NonNull String, @Nullable int[]);















    method public int describeContents();

























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



+5
−19




























Original line number
Diff line number
Diff line








@@ -29,7 +29,6 @@ import static android.system.OsConstants.EPIPE;













import static java.util.Objects.requireNonNull;































import android.annotation.ElapsedRealtimeLong;













import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.IntRange;















import android.annotation.NonNull;










@@ -875,9 +874,10 @@ public class SoundTrigger {













    /*****************************************************************************















     * A GenericSoundModel is a specialized {@link SoundModel} for non-voice sound















     * patterns.













     *













     * @hide















     ****************************************************************************/













    @FlaggedApi(android.media.soundtrigger.Flags.FLAG_SOUND_TRIGGER_GENERIC_MODEL_API)













    public static final class GenericSoundModel extends SoundModel implements Parcelable {













    public static class GenericSoundModel extends SoundModel implements Parcelable {































        public static final @android.annotation.NonNull Parcelable.Creator<GenericSoundModel> CREATOR















                = new Parcelable.Creator<GenericSoundModel>() {









@@ -890,26 +890,12 @@ public class SoundTrigger {













            }















        };





























        /**













         * Constructor for {@link GenericSoundModel} with version.













         *













         * @param uuid Unique identifier for this sound model.













         * @param vendorUuid Unique vendor identifier for this sound model.













         * @param data Opaque data for this sound model.













         * @param version Vendor-specific version number of this sound model.













         */















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















                @Nullable byte[] data, int version) {















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















        }





























        /**













         * Constructor for {@link GenericSoundModel} without version. The version is set to -1.













         *













         * @param uuid Unique identifier for this sound model.













         * @param vendorUuid Unique vendor identifier for this sound model.













         * @param data Opaque data for this sound model.













         */













        @UnsupportedAppUsage















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















                @Nullable byte[] data) {















            this(uuid, vendorUuid, data, -1);









@@ -933,7 +919,7 @@ public class SoundTrigger {













        }































        @Override













        public void writeToParcel(@NonNull Parcel dest, int flags) {













        public void writeToParcel(Parcel dest, int flags) {















            dest.writeString(getUuid().toString());















            if (getVendorUuid() == null) {















                dest.writeInt(-1);