Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c55822b authored by Charles Chen's avatar Charles Chen
Browse files

Add permission resitrictions for VisualQueryDetectionService 

Add verification in the system server to verify if the app holds valid
permission to use the VisualQueryDetectionService. The implementation to enforce the permission checking is already implemented in the VoiceInteractionManagerService. This CL only adds the annotation for the Api.

Bug: 265540209
Test: Manual & atest CtsVoiceInteractionTestCases
Change-Id: Ib792f2ae349e48175ce59478e856a3a6d22b7b63
parent 6ff0b0b1

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12613,7 +12613,7 @@ package android.service.voice { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.AlwaysOnHotwordDetector createAlwaysOnHotwordDetector(String, java.util.Locale, @Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, android.service.voice.AlwaysOnHotwordDetector.Callback);

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.HotwordDetector createHotwordDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull android.service.voice.HotwordDetector.Callback);

    method @NonNull @RequiresPermission("android.permission.MANAGE_VOICE_KEYPHRASES") public final android.media.voice.KeyphraseModelManager createKeyphraseModelManager();

    method @NonNull public final android.service.voice.VisualQueryDetector createVisualQueryDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.VisualQueryDetector.Callback);

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.VisualQueryDetector createVisualQueryDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.VisualQueryDetector.Callback);

  }















}

























core/java/android/service/voice/VoiceInteractionService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -612,8 +612,8 @@ public class VoiceInteractionService extends Service {













     *















     * @hide















     */













    // TODO: add MANAGE_HOTWORD_DETECTION permission to protect this API and update java doc.















    @SystemApi













    @RequiresPermission(Manifest.permission.MANAGE_HOTWORD_DETECTION)















    @NonNull















    public final VisualQueryDetector createVisualQueryDetector(















            @Nullable PersistableBundle options,