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

Merge "Revert "Relax permission checks in sound trigger middleware"" into rvc-dev am: a08e8e075d

Browse Source 
Change-Id: Ibaeb2261fc900127e239dfd484e5327fbac31c42
This commit is contained in:
Ytai Ben-tsvi
2020-03-18 21:58:16 +00:00
committed by Automerger Merge Worker
parent 55713a6db0 a08e8e075d
commit 7709a21384
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java
View File

@@ -252,8 +252,21 @@ public class SoundTriggerMiddlewareValidation implements ISoundTriggerMiddleware
* @param permission The permission to check. * @param permission The permission to check.
*/ */
void enforcePermission(String permission) { void enforcePermission(String permission) {
mContext.enforceCallingOrSelfPermission(permission, final int status = PermissionChecker.checkCallingOrSelfPermissionForPreflight(mContext,
String.format("Caller must have the %s permission.", permission)); permission);
switch (status) {
case PermissionChecker.PERMISSION_GRANTED:
return;
case PermissionChecker.PERMISSION_HARD_DENIED:
throw new SecurityException(
String.format("Caller must have the %s permission.", permission));
case PermissionChecker.PERMISSION_SOFT_DENIED:
throw new ServiceSpecificException(Status.TEMPORARY_PERMISSION_DENIED,
String.format("Caller must have the %s permission.", permission));
default:
throw new InternalServerError(
new RuntimeException("Unexpected perimission check result."));
}
} }
@Override @Override