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

Commit 38699d82 authored by Ytai Ben-tsvi's avatar Ytai Ben-tsvi Committed by Automerger Merge Worker
Browse files

Merge "Fix permission checking in SoundTriggerService" into sc-dev am: 7461a557 am: 532bb317 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081290

Change-Id: If9b0c32021f16f61b92cff36d8eeaadb3a9e4a0d
parents 72fd6ede 532bb317

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

+6 −1
Original line number Diff line number Diff line
@@ -863,7 +863,12 @@ public class SoundTriggerService extends SystemService { 
        }



        private void enforceCallingPermission(String permission) {

            PermissionUtil.checkPermissionForPreflight(mContext, mOriginatorIdentity, permission);

            if (PermissionUtil.checkPermissionForPreflight(mContext, mOriginatorIdentity,

                    permission) != PackageManager.PERMISSION_GRANTED) {

                throw new SecurityException(

                        "Identity " + mOriginatorIdentity + " does not have permission "

                                + permission);

            }

        }



        private void enforceDetectionPermissions(ComponentName detectionService) {