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

Merge "disable ENFORCE_HOTWORD_PHRASE_ID ChangeId" into udc-dev am: d50bb77f9a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21536123

Change-Id: I9b644106dc1ee079ec9ae9765780394b75a776df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nicholas Ambur
2023-02-24 18:34:38 +00:00
committed by Automerger Merge Worker
parent b329e58d1c d50bb77f9a
commit 95f6caa3bb
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
View File

@@ -30,7 +30,7 @@ import static com.android.internal.util.FrameworkStatsLog.HOTWORD_DETECTOR_KEYPH
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledSince; import android.compat.annotation.Disabled;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentCaptureOptions; import android.content.ContentCaptureOptions;
import android.content.Context; import android.content.Context;
@@ -41,7 +41,6 @@ import android.media.AudioFormat;
import android.media.AudioManagerInternal; import android.media.AudioManagerInternal;
import android.media.permission.Identity; import android.media.permission.Identity;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.IRemoteCallback; import android.os.IRemoteCallback;
@@ -89,8 +88,7 @@ final class HotwordDetectionConnection {
static final boolean DEBUG = false; static final boolean DEBUG = false;
/** /**
* For apps targeting Android API Build.VERSION_CODES#UPSIDE_DOWN_CAKE and above, * Implementors of the HotwordDetectionService must not augment the phrase IDs which are
* implementors of the HotwordDetectionService must not augment the phrase IDs which are
* supplied via HotwordDetectionService * supplied via HotwordDetectionService
* #onDetect(AlwaysOnHotwordDetector.EventPayload, long, HotwordDetectionService.Callback). * #onDetect(AlwaysOnHotwordDetector.EventPayload, long, HotwordDetectionService.Callback).
* *
@@ -104,7 +102,7 @@ final class HotwordDetectionConnection {
* </p> * </p>
*/ */
@ChangeId @ChangeId
@EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) @Disabled
public static final long ENFORCE_HOTWORD_PHRASE_ID = 215066299L; public static final long ENFORCE_HOTWORD_PHRASE_ID = 215066299L;
private static final String KEY_RESTART_PERIOD_IN_SECONDS = "restart_period_in_seconds"; private static final String KEY_RESTART_PERIOD_IN_SECONDS = "restart_period_in_seconds";