Merge "Add @FlaggedApi for HotwordTrainingData and HotwordTrainingAudio." into main (a35bd2ca) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -12744,7 +12744,7 @@ package android.service.voice {
		method @NonNull public android.service.voice.HotwordRejectedResult.Builder setConfidenceLevel(int);
		}

		public final class HotwordTrainingAudio implements android.os.Parcelable {
		@FlaggedApi("android.service.voice.flags.allow_training_data_egress_from_hds") public final class HotwordTrainingAudio implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.media.AudioFormat getAudioFormat();
		method @NonNull public int getAudioType();
		@@ -12755,7 +12755,7 @@ package android.service.voice {
		field public static final int HOTWORD_OFFSET_UNSET = -1; // 0xffffffff
		}

		public static final class HotwordTrainingAudio.Builder {
		@FlaggedApi("android.service.voice.flags.allow_training_data_egress_from_hds") public static final class HotwordTrainingAudio.Builder {
		ctor public HotwordTrainingAudio.Builder(@NonNull byte[], @NonNull android.media.AudioFormat);
		method @NonNull public android.service.voice.HotwordTrainingAudio build();
		method @NonNull public android.service.voice.HotwordTrainingAudio.Builder setAudioFormat(@NonNull android.media.AudioFormat);
		@@ -12764,7 +12764,7 @@ package android.service.voice {
		method @NonNull public android.service.voice.HotwordTrainingAudio.Builder setHotwordOffsetMillis(int);
		}

		public final class HotwordTrainingData implements android.os.Parcelable {
		@FlaggedApi("android.service.voice.flags.allow_training_data_egress_from_hds") public final class HotwordTrainingData implements android.os.Parcelable {
		method public int describeContents();
		method public static int getMaxTrainingDataBytes();
		method public int getTimeoutStage();
		@@ -12773,7 +12773,7 @@ package android.service.voice {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.voice.HotwordTrainingData> CREATOR;
		}

		public static final class HotwordTrainingData.Builder {
		@FlaggedApi("android.service.voice.flags.allow_training_data_egress_from_hds") public static final class HotwordTrainingData.Builder {
		ctor public HotwordTrainingData.Builder();
		method @NonNull public android.service.voice.HotwordTrainingData.Builder addTrainingAudio(@NonNull android.service.voice.HotwordTrainingAudio);
		method @NonNull public android.service.voice.HotwordTrainingData build();

core/java/android/service/voice/HotwordTrainingAudio.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.service.voice;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		@@ -23,6 +24,7 @@ import android.annotation.SystemApi;
		import android.media.AudioFormat;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.service.voice.flags.Flags;

		import com.android.internal.util.DataClass;

		@@ -33,6 +35,7 @@ import java.util.Objects;
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_ALLOW_TRAINING_DATA_EGRESS_FROM_HDS)
		@DataClass(
		genConstructor = false,
		genBuilder = true,
		@@ -65,12 +68,12 @@ public final class HotwordTrainingAudio implements Parcelable {

		/**
		* App-defined identifier to distinguish hotword training audio instances.
		*/
		* <p> Returns -1 if unset. */
		@NonNull
		private final int mAudioType;

		private static int defaultAudioType() {
		return 0;
		return -1;
		}

		/**
		@@ -152,6 +155,7 @@ public final class HotwordTrainingAudio implements Parcelable {

		/**
		* App-defined identifier to distinguish hotword training audio instances.
		* <p> Returns -1 if unset.
		*/
		@DataClass.Generated.Member
		public @NonNull int getAudioType() {
		@@ -274,6 +278,7 @@ public final class HotwordTrainingAudio implements Parcelable {
		/**
		* A builder for {@link HotwordTrainingAudio}
		*/
		@FlaggedApi(Flags.FLAG_ALLOW_TRAINING_DATA_EGRESS_FROM_HDS)
		@SuppressWarnings("WeakerAccess")
		@DataClass.Generated.Member
		public static final class Builder extends BaseBuilder {
		@@ -318,6 +323,7 @@ public final class HotwordTrainingAudio implements Parcelable {

		/**
		* App-defined identifier to distinguish hotword training audio instances.
		* <p> Returns -1 if unset.
		*/
		@DataClass.Generated.Member
		public @NonNull Builder setAudioType(@NonNull int value) {
		@@ -368,7 +374,7 @@ public final class HotwordTrainingAudio implements Parcelable {
		}

		@DataClass.Generated(
		time = 1694193905346L,
		time = 1697827049629L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/service/voice/HotwordTrainingAudio.java",
		inputSignatures = "public static final int HOTWORD_OFFSET_UNSET\nprivate final @android.annotation.NonNull byte[] mHotwordAudio\nprivate final @android.annotation.NonNull android.media.AudioFormat mAudioFormat\nprivate final @android.annotation.NonNull int mAudioType\nprivate int mHotwordOffsetMillis\nprivate java.lang.String hotwordAudioToString()\nprivate static int defaultAudioType()\nclass HotwordTrainingAudio extends java.lang.Object implements [android.os.Parcelable]\npublic @android.annotation.SuppressLint @android.annotation.NonNull android.service.voice.HotwordTrainingAudio.Builder setHotwordAudio(byte[])\nclass BaseBuilder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=true, genEqualsHashCode=true, genHiddenConstDefs=true, genParcelable=true, genToString=true)\npublic @android.annotation.SuppressLint @android.annotation.NonNull android.service.voice.HotwordTrainingAudio.Builder setHotwordAudio(byte[])\nclass BaseBuilder extends java.lang.Object implements []")

core/java/android/service/voice/HotwordTrainingData.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -16,10 +16,12 @@

		package android.service.voice;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.service.voice.flags.Flags;
		import android.text.TextUtils;

		import com.android.internal.util.DataClass;
		@@ -47,6 +49,7 @@ import java.util.List;
		genParcelable = true,
		genToString = true)
		@SystemApi
		@FlaggedApi(Flags.FLAG_ALLOW_TRAINING_DATA_EGRESS_FROM_HDS)
		public final class HotwordTrainingData implements Parcelable {
		/** Max size for hotword training data in bytes. */
		public static int getMaxTrainingDataBytes() {
		@@ -63,11 +66,11 @@ public final class HotwordTrainingData implements Parcelable {
		}

		/** App-defined stage when hotword model timed-out while running.
		* <p> Returns 0 if unset. */
		* <p> Returns -1 if unset. */
		private final int mTimeoutStage;

		private static int defaultTimeoutStage() {
		return 0;
		return -1;
		}

		private void onConstructed() {
		@@ -120,7 +123,7 @@ public final class HotwordTrainingData implements Parcelable {

		/**
		* App-defined stage when hotword model timed-out while running.
		* <p> Returns 0 if unset.
		* <p> Returns -1 if unset.
		*/
		@DataClass.Generated.Member
		public int getTimeoutStage() {
		@@ -218,6 +221,7 @@ public final class HotwordTrainingData implements Parcelable {
		/**
		* A builder for {@link HotwordTrainingData}
		*/
		@FlaggedApi(Flags.FLAG_ALLOW_TRAINING_DATA_EGRESS_FROM_HDS)
		@SuppressWarnings("WeakerAccess")
		@DataClass.Generated.Member
		public static final class Builder {
		@@ -251,7 +255,7 @@ public final class HotwordTrainingData implements Parcelable {

		/**
		* App-defined stage when hotword model timed-out while running.
		* <p> Returns 0 if unset.
		* <p> Returns -1 if unset.
		*/
		@DataClass.Generated.Member
		public @NonNull Builder setTimeoutStage(int value) {
		@@ -287,7 +291,7 @@ public final class HotwordTrainingData implements Parcelable {
		}

		@DataClass.Generated(
		time = 1696092128091L,
		time = 1697826948280L,
		codegenVersion = "1.0.23",
		sourceFile = "frameworks/base/core/java/android/service/voice/HotwordTrainingData.java",
		inputSignatures = "private final @android.annotation.NonNull @com.android.internal.util.DataClass.PluralOf(\"trainingAudio\") java.util.List<android.service.voice.HotwordTrainingAudio> mTrainingAudioList\nprivate final int mTimeoutStage\npublic static int getMaxTrainingDataBytes()\nprivate static java.util.List<android.service.voice.HotwordTrainingAudio> defaultTrainingAudioList()\nprivate static int defaultTimeoutStage()\nprivate void onConstructed()\nclass HotwordTrainingData extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=true, genEqualsHashCode=true, genHiddenConstDefs=true, genParcelable=true, genToString=true)")