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

Commit 6a7f3726 authored by Hai Zhang's avatar Hai Zhang
Browse files

Add missing permission checks for adding permission listeners. 

They were in the old PermissionManagerServiceImpl but missing in
ag/20684040. The new subsystem is only enabled in V+ so we can just fix
it directly.

Also added the permission check for removing despite that the old method
was only enforcing not instant app, because the removing API is
annotated with requiring the permission, and anyone currently able to
add will still remain able to remove since it's the same permission.

Bug: 263504888
Test: presubmit
Change-Id: Ie5688abdbc4d9039c3f7c42f3d253e69f7cc899d
parent 7bee98d7

services/permission/java/com/android/server/permission/access/permission/PermissionService.kt

+9 −0
Original line number Diff line number Diff line
@@ -1753,10 +1753,19 @@ class PermissionService( 
    }



    override fun addOnPermissionsChangeListener(listener: IOnPermissionsChangeListener) {

        context.enforceCallingOrSelfPermission(

            Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS, "addOnPermissionsChangeListener"

        )



        onPermissionsChangeListeners.addListener(listener)

    }



    override fun removeOnPermissionsChangeListener(listener: IOnPermissionsChangeListener) {

        context.enforceCallingOrSelfPermission(

            Manifest.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS,

            "removeOnPermissionsChangeListener"

        )



        onPermissionsChangeListeners.removeListener(listener)

    }