Merge "JobSchedulerService - call PermissionEnforcer helper on methods annotated with @EnforcePermission"

This commit is contained in:
Matt Gilbride
2022-12-08 21:53:08 +00:00
committed by Android (Google) Code Review

View File

@@ -3995,6 +3995,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");
}
@@ -4006,6 +4007,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");
}
@@ -4013,8 +4015,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");
}