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

Commit b0f77702 authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Check permission for soundtrigger detection service" into rvc-dev am:... 

Merge "Check permission for soundtrigger detection service" into rvc-dev am: 7714a182 am: 3aaf8a9e am: a0d77667

Change-Id: Ie27c484d002375c4cf18325c9c389f1b2dc16337
parents 252be277 a0d77667

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+12 −0
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ public class SoundTriggerService extends SystemService { 


            enforceCallingPermission(Manifest.permission.MANAGE_SOUND_TRIGGER);



            enforceDetectionPermissions(detectionService);



            if (!isInitialized()) return STATUS_ERROR;

            if (DEBUG) {

                Slog.i(TAG, "startRecognition(): id = " + soundModelId);
@@ -1532,6 +1534,16 @@ public class SoundTriggerService extends SystemService { 
        }

    }



    private void enforceDetectionPermissions(ComponentName detectionService) {

        PackageManager packageManager = mContext.getPackageManager();

        String packageName = detectionService.getPackageName();

        if (packageManager.checkPermission(Manifest.permission.CAPTURE_AUDIO_HOTWORD, packageName)

                != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException(detectionService.getPackageName() + " does not have"

                    + " permission " + Manifest.permission.CAPTURE_AUDIO_HOTWORD);

        }

    }



    //=================================================================

    // For logging