Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "API rename: SandboxedDetectionInitializer" into udc-dev

Browse Source
This commit is contained in:
Charles Chen
2023-03-03 23:34:44 +00:00
committed by Android (Google) Code Review
parent b508865fad 322b32fc04
commit 7c86b5b951
7 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/api/system-current.txt
View File

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

2
core/api/test-current.txt
View File

@@ -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;
}

16
core/java/android/service/voice/HotwordDetectionService.java
View File

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

6
core/java/android/service/voice/HotwordDetector.java
View File

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

6
core/java/android/service/voice/SandboxedDetectionServiceBase.java → core/java/android/service/voice/SandboxedDetectionInitializer.java
View File

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

4
core/java/android/service/voice/VisualQueryDetectionService.java
View File

@@ -58,7 +58,7 @@ import java.util.function.IntConsumer;
*/
@SystemApi
public abstract class VisualQueryDetectionService extends Service
implements SandboxedDetectionServiceBase {
implements SandboxedDetectionInitializer {
private static final String TAG = VisualQueryDetectionService.class.getSimpleName();
@@ -175,7 +175,7 @@ public abstract class VisualQueryDetectionService 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);
}

7
core/java/android/service/voice/VisualQueryDetector.java
View File

@@ -201,9 +201,10 @@ public class VisualQueryDetector {
* short amount of time to report its initialization state.
*
* @param status Info about initialization state of {@link VisualQueryDetectionService}; the
* allowed values are {@link SandboxedDetectionServiceBase#INITIALIZATION_STATUS_SUCCESS},
* 1<->{@link SandboxedDetectionServiceBase#getMaxCustomInitializationStatus()},
* {@link SandboxedDetectionServiceBase#INITIALIZATION_STATUS_UNKNOWN}.
* allowed values are
* {@link SandboxedDetectionInitializer#INITIALIZATION_STATUS_SUCCESS},
* 1<->{@link SandboxedDetectionInitializer#getMaxCustomInitializationStatus()},
* {@link SandboxedDetectionInitializer#INITIALIZATION_STATUS_UNKNOWN}.
*/
void onVisualQueryDetectionServiceInitialized(int status);