diff options
| author | 2024-11-05 19:33:56 +0000 | |
|---|---|---|
| committer | 2024-11-05 19:33:56 +0000 | |
| commit | 5bc9af9d2a841b8c929a6deeeb099d96801f154f (patch) | |
| tree | dac98bb7ca827a9fc158c84f1f50ded1f89828f5 | |
| parent | 4410264818054e620c7136189accca28fec377fb (diff) | |
| parent | 7da83d8972895d8dfe40782543a3c0d5256682ac (diff) | |
Merge "Only accept NonNull data byte array in RecognitionConfig.Builder" into main
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/soundtrigger/SoundTrigger.java | 4 | ||||
| -rw-r--r-- | core/java/android/service/voice/AlwaysOnHotwordDetector.java | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 91ce6247d0de..26cb5621bab0 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7033,7 +7033,7 @@ package android.hardware.soundtrigger { method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setAllowMultipleTriggers(boolean); method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setAudioCapabilities(int); method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setCaptureRequested(boolean); - method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setData(@Nullable byte[]); + method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setData(@NonNull byte[]); method @NonNull public android.hardware.soundtrigger.SoundTrigger.RecognitionConfig.Builder setKeyphrases(@NonNull java.util.Collection<android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionExtra>); } diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index c6fd0ee3c80d..85cf9491287c 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -1750,8 +1750,8 @@ public class SoundTrigger { * internals, typically during enrollment. * @return the same Builder instance. */ - public @NonNull Builder setData(@Nullable byte[] data) { - mData = data; + public @NonNull Builder setData(@NonNull byte[] data) { + mData = requireNonNull(data, "Data must not be null"); return this; } diff --git a/core/java/android/service/voice/AlwaysOnHotwordDetector.java b/core/java/android/service/voice/AlwaysOnHotwordDetector.java index 2e660fc1f157..7d79fd3d44ea 100644 --- a/core/java/android/service/voice/AlwaysOnHotwordDetector.java +++ b/core/java/android/service/voice/AlwaysOnHotwordDetector.java @@ -1164,7 +1164,7 @@ public class AlwaysOnHotwordDetector extends AbstractDetector { public boolean startRecognition(@RecognitionFlags int recognitionFlags) { if (DBG) Slog.d(TAG, "startRecognition(" + recognitionFlags + ")"); synchronized (mLock) { - return startRecognitionLocked(recognitionFlags, null /* data */) == STATUS_OK; + return startRecognitionLocked(recognitionFlags, /* data= */new byte[0]) == STATUS_OK; } } @@ -1496,8 +1496,8 @@ public class AlwaysOnHotwordDetector extends AbstractDetector { } @GuardedBy("mLock") - private int startRecognitionLocked(int recognitionFlags, - @Nullable byte[] data) { + @SuppressWarnings("FlaggedApi") // RecognitionConfig.Builder is available internally. + private int startRecognitionLocked(int recognitionFlags, @NonNull byte[] data) { if (DBG) { Slog.d(TAG, "startRecognition(" + recognitionFlags |