From 0f695b7015a264dfc1522131fbed7e27daf7bd25 Mon Sep 17 00:00:00 2001 From: Nicholas Ambur Date: Wed, 22 Feb 2023 05:53:48 +0000 Subject: [PATCH] disable ENFORCE_HOTWORD_PHRASE_ID ChangeId Change ID is only enabled when the target SDK of the active VoiceInteractionService is CUR_DEVELOPMENT Test: manually verify via logs change is disabled Bug: 269809400 Change-Id: I1f4f5d0133b5a59f01d849d38533f439eb8196f1 --- .../voiceinteraction/HotwordDetectionConnection.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java index 43592348adb3c..025e1dc78c86f 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java @@ -30,7 +30,7 @@ import static com.android.internal.util.FrameworkStatsLog.HOTWORD_DETECTOR_KEYPH import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.ChangeId; -import android.compat.annotation.EnabledSince; +import android.compat.annotation.Disabled; import android.content.ComponentName; import android.content.ContentCaptureOptions; import android.content.Context; @@ -41,7 +41,6 @@ import android.media.AudioFormat; import android.media.AudioManagerInternal; import android.media.permission.Identity; import android.os.Binder; -import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.IRemoteCallback; @@ -89,8 +88,7 @@ final class HotwordDetectionConnection { 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 * #onDetect(AlwaysOnHotwordDetector.EventPayload, long, HotwordDetectionService.Callback). * @@ -104,7 +102,7 @@ final class HotwordDetectionConnection { *

*/ @ChangeId - @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + @Disabled public static final long ENFORCE_HOTWORD_PHRASE_ID = 215066299L; private static final String KEY_RESTART_PERIOD_IN_SECONDS = "restart_period_in_seconds";