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

Commit 8bc3a3b2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I25aa5a8908f4cd2a383fe4ddcf53751c37b06909
parents bb57e005 cbed111b

services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerMiddlewareValidation.java

+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