Merge cherrypicks of ['googleplex-android-review.googlesource.com/28532006'] into 24Q4-release. (2ed01dc1) · Commits · e / os / android_frameworks_base

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);