Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix permission checking in SoundTriggerService" into sc-dev am: 7461a5576b am: 532bb317c1

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

Change-Id: If9b0c32021f16f61b92cff36d8eeaadb3a9e4a0d
This commit is contained in:
Ytai Ben-tsvi
2021-06-24 07:24:04 +00:00
committed by Automerger Merge Worker
parent 72fd6ede43 532bb317c1
commit 38699d8254
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
View File

@@ -863,7 +863,12 @@ public class SoundTriggerService extends SystemService {
} }
private void enforceCallingPermission(String permission) { 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) { private void enforceDetectionPermissions(ComponentName detectionService) {