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

Commit 765a65bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Call enforceCallingPermission instead of annotation EnforcePermission"

parents fe8bf190 3cc7d7d5

core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl

+0 −2
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ interface IVoiceInteractionManagerService { 
     */

    void shutdownHotwordDetectionService();



    @EnforcePermission(allOf={"RECORD_AUDIO", "CAPTURE_AUDIO_HOTWORD"})

    void startListeningFromMic(

        in AudioFormat audioFormat,

        in IMicrophoneHotwordDetectionVoiceInteractionCallback callback);
@@ -286,7 +285,6 @@ interface IVoiceInteractionManagerService { 
    /**

     * Test API to simulate to trigger hardware recognition event for test.

     */

    @EnforcePermission(allOf={"RECORD_AUDIO", "CAPTURE_AUDIO_HOTWORD"})

    void triggerHardwareRecognitionEventForTest(

            in SoundTrigger.KeyphraseRecognitionEvent event,

            in IHotwordRecognitionStatusCallback callback);

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -1284,12 +1284,13 @@ public class VoiceInteractionManagerService extends SystemService { 
            }

        }



        @android.annotation.EnforcePermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD})

        @Override

        public void startListeningFromMic(

                AudioFormat audioFormat,

                IMicrophoneHotwordDetectionVoiceInteractionCallback callback)

                throws RemoteException {

            enforceCallingPermission(Manifest.permission.RECORD_AUDIO);

            enforceCallingPermission(Manifest.permission.CAPTURE_AUDIO_HOTWORD);

            synchronized (this) {

                enforceIsCurrentVoiceInteractionService();
@@ -1349,12 +1350,13 @@ public class VoiceInteractionManagerService extends SystemService { 
            }

        }



        @android.annotation.EnforcePermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD})

        @Override

        public void triggerHardwareRecognitionEventForTest(

                SoundTrigger.KeyphraseRecognitionEvent event,

                IHotwordRecognitionStatusCallback callback)

                throws RemoteException {

            enforceCallingPermission(Manifest.permission.RECORD_AUDIO);

            enforceCallingPermission(Manifest.permission.CAPTURE_AUDIO_HOTWORD);

            synchronized (this) {

                enforceIsCurrentVoiceInteractionService();