Merge "Fix permission checking in SoundTriggerService" into sc-dev

2021-06-24 07:00:23 +00:00
parent 146efcb572 b2d3d3aba5
commit 7461a5576b
1 changed files with 6 additions and 1 deletions
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
@@ -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) {