Merge "API rename: SandboxedDetectionInitializer" into udc-dev (7c86b5b9) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+3 −3

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

		public abstract class HotwordDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionServiceBase {
		public abstract class HotwordDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionInitializer {
		ctor public HotwordDetectionService();
		method @Deprecated public static int getMaxCustomInitializationStatus();
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		@@ -13238,7 +13238,7 @@ package android.service.voice {
		method @NonNull public android.service.voice.HotwordRejectedResult.Builder setConfidenceLevel(int);
		}

		public interface SandboxedDetectionServiceBase {
		public interface SandboxedDetectionInitializer {
		method public static int getMaxCustomInitializationStatus();
		method public void onUpdateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, long, @Nullable java.util.function.IntConsumer);
		field public static final int INITIALIZATION_STATUS_SUCCESS = 0; // 0x0
		@@ -13260,7 +13260,7 @@ package android.service.voice {
		field @NonNull public static final android.os.Parcelable.Creator<android.service.voice.UnknownFailure> CREATOR;
		}

		public abstract class VisualQueryDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionServiceBase {
		public abstract class VisualQueryDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionInitializer {
		ctor public VisualQueryDetectionService();
		method public final void finishQuery() throws java.lang.IllegalStateException;
		method public final void gainedAttention();

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2812,7 +2812,7 @@ package android.service.voice {
		method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setKeyphraseRecognitionExtras(@NonNull java.util.List<android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionExtra>);
		}

		public abstract class HotwordDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionServiceBase {
		public abstract class HotwordDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionInitializer {
		field public static final boolean ENABLE_PROXIMITY_RESULT = true;
		}

core/java/android/service/voice/HotwordDetectionService.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ import java.util.function.IntConsumer;
		*/
		@SystemApi
		public abstract class HotwordDetectionService extends Service
		implements SandboxedDetectionServiceBase {
		implements SandboxedDetectionInitializer {
		private static final String TAG = "HotwordDetectionService";
		private static final boolean DBG = false;

		@@ -89,21 +89,23 @@ public abstract class HotwordDetectionService extends Service
		/**
		* Indicates that the updated status is successful.
		*
		* @deprecated Replaced with {@link SandboxedDetectionServiceBase#INITIALIZATION_STATUS_SUCCESS}
		* @deprecated Replaced with
		* {@link SandboxedDetectionInitializer#INITIALIZATION_STATUS_SUCCESS}
		*/
		@Deprecated
		public static final int INITIALIZATION_STATUS_SUCCESS =
		SandboxedDetectionServiceBase.INITIALIZATION_STATUS_SUCCESS;
		SandboxedDetectionInitializer.INITIALIZATION_STATUS_SUCCESS;

		/**
		* Indicates that the callback wasn’t invoked within the timeout.
		* This is used by system.
		*
		* @deprecated Replaced with {@link SandboxedDetectionServiceBase#INITIALIZATION_STATUS_UNKNOWN}
		* @deprecated Replaced with
		* {@link SandboxedDetectionInitializer#INITIALIZATION_STATUS_UNKNOWN}
		*/
		@Deprecated
		public static final int INITIALIZATION_STATUS_UNKNOWN =
		SandboxedDetectionServiceBase.INITIALIZATION_STATUS_UNKNOWN;
		SandboxedDetectionInitializer.INITIALIZATION_STATUS_UNKNOWN;

		/**
		* Source for the given audio stream.
		@@ -259,7 +261,7 @@ public abstract class HotwordDetectionService extends Service
		*
		* @hide
		* @deprecated Replaced with
		* {@link SandboxedDetectionServiceBase#getMaxCustomInitializationStatus()}
		* {@link SandboxedDetectionInitializer#getMaxCustomInitializationStatus()}
		*/
		@SystemApi
		@Deprecated
		@@ -368,7 +370,7 @@ public abstract class HotwordDetectionService extends Service
		private void onUpdateStateInternal(@Nullable PersistableBundle options,
		@Nullable SharedMemory sharedMemory, IRemoteCallback callback) {
		IntConsumer intConsumer =
		SandboxedDetectionServiceBase.createInitializationStatusConsumer(callback);
		SandboxedDetectionInitializer.createInitializationStatusConsumer(callback);
		onUpdateState(options, sharedMemory, UPDATE_TIMEOUT_MILLIS, intConsumer);
		}

core/java/android/service/voice/HotwordDetector.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -283,9 +283,9 @@ public interface HotwordDetector {
		*
		* @param status Info about initialization state of {@link HotwordDetectionService} or
		* {@link VisualQueryDetectionService}; allowed values are
		* {@link SandboxedDetectionServiceBase#INITIALIZATION_STATUS_SUCCESS},
		* 1<->{@link SandboxedDetectionServiceBase#getMaxCustomInitializationStatus()},
		* {@link SandboxedDetectionServiceBase#INITIALIZATION_STATUS_UNKNOWN}.
		* {@link SandboxedDetectionInitializer#INITIALIZATION_STATUS_SUCCESS},
		* 1<->{@link SandboxedDetectionInitializer#getMaxCustomInitializationStatus()},
		* {@link SandboxedDetectionInitializer#INITIALIZATION_STATUS_UNKNOWN}.
		*/
		void onHotwordDetectionServiceInitialized(int status);

core/java/android/service/voice/SandboxedDetectionServiceBase.java→core/java/android/service/voice/SandboxedDetectionInitializer.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -28,12 +28,12 @@ import android.os.SharedMemory;
		import java.util.function.IntConsumer;

		/**
		* Base for all sandboxed detection services, providing a common interface for initialization.
		* Provides common initialzation methods for sandboxed detection services.
		*
		* @hide
		*/
		@SystemApi
		public interface SandboxedDetectionServiceBase {
		public interface SandboxedDetectionInitializer {

		/**
		* Indicates that the updated status is successful.
		@@ -77,7 +77,7 @@ public interface SandboxedDetectionServiceBase {
		if (callback != null) {
		intConsumer =
		value -> {
		if (value > SandboxedDetectionServiceBase
		if (value > SandboxedDetectionInitializer
		.getMaxCustomInitializationStatus()) {
		throw new IllegalArgumentException(
		"The initialization status is invalid for " + value);