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

Commit 9aff83da authored by Matt Gilbride's avatar Matt Gilbride Committed by Android (Google) Code Review
Browse files

Merge "JobSchedulerService - call PermissionEnforcer helper on methods... 

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

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+4 −1
Original line number Diff line number Diff line
@@ -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");

            }