Merge "Fix permission checking in SoundTriggerService" into sc-dev am: 7461a5576b am: 30d571456c

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

Change-Id: I05983c00ad5472aec618a148ab80f30f0da06b7d
This commit is contained in:
Ytai Ben-tsvi
2021-06-24 07:23:30 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {