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

Commit e8782e62 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Relax permission checks in sound trigger middleware" into rvc-dev am: cbed111b am: 57d6dbfc am: 671e9d90

Change-Id: I064d72dc99b62dc36499ddb1847e4b48aba02384
parents b027e2aa 671e9d90
Loading
Loading
Loading
Loading
+2 −15
Original line number Diff line number Diff line
@@ -249,21 +249,8 @@ public class SoundTriggerMiddlewareValidation implements ISoundTriggerMiddleware
     * @param permission The permission to check.
     */
    void enforcePermission(String permission) {
        final int status = PermissionChecker.checkCallingOrSelfPermissionForPreflight(mContext,
                permission);
        switch (status) {
            case PermissionChecker.PERMISSION_GRANTED:
                return;
            case PermissionChecker.PERMISSION_HARD_DENIED:
                throw new SecurityException(
        mContext.enforceCallingOrSelfPermission(permission,
                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