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

JobSchedulerService - call PermissionEnforcer helper on methods annotated with @EnforcePermission

Browse Source 
All java methods annotated with @EnforcePermission
must call super.<methodName>_enforcePermission
method provided by PermissionEnforcer.

This required by the @EnforcePermission annotation,
and enforced by a lint check.

This lint check does not yet run globally, causing
this to be missed. That problem is being addressed
imminently.

Bug: 236558918
Test: TH
Change-Id: Ie3ac9d33644f69e81d0570caf09036817f0d0d39
This commit is contained in:
mattgilbride
2022-12-08 17:33:18 +00:00
parent eae344945d
commit c32db2d051
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
View File

@@ -3824,6 +3824,7 @@ public class JobSchedulerService extends com.android.server.SystemService
@Override
@EnforcePermission(allOf = {MANAGE_ACTIVITY_TASKS, INTERACT_ACROSS_USERS_FULL})
public void registerUserVisibleJobObserver(@NonNull IUserVisibleJobObserver observer) {
super.registerUserVisibleJobObserver_enforcePermission();
if (observer == null) {
throw new NullPointerException("observer");
}
@@ -3835,6 +3836,7 @@ public class JobSchedulerService extends com.android.server.SystemService
@Override
@EnforcePermission(allOf = {MANAGE_ACTIVITY_TASKS, INTERACT_ACROSS_USERS_FULL})
public void unregisterUserVisibleJobObserver(@NonNull IUserVisibleJobObserver observer) {
super.unregisterUserVisibleJobObserver_enforcePermission();
if (observer == null) {
throw new NullPointerException("observer");
}
@@ -3842,8 +3844,9 @@ public class JobSchedulerService extends com.android.server.SystemService
}
@Override
@EnforcePermission(allOf = {"MANAGE_ACTIVITY_TASKS", "INTERACT_ACROSS_USERS_FULL"})
@EnforcePermission(allOf = {MANAGE_ACTIVITY_TASKS, INTERACT_ACROSS_USERS_FULL})
public void stopUserVisibleJobsForUser(@NonNull String packageName, int userId) {
super.stopUserVisibleJobsForUser_enforcePermission();
if (packageName == null) {
throw new NullPointerException("packageName");
}