summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Gilbride <mattgilbride@google.com> 2022-12-08 21:53:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-12-08 21:53:08 +0000
commit9aff83dab3d336b51f32d92ce71fe8b1b04d7f19 (patch)
tree3cd1948e606badbeba84d7c0735278b1d80fbbb4
parenta549bd734b5edb0171b0fffe1415915f8c61a9bc (diff)
parentc32db2d0511e2b2aec9ee6ccb1ff347cfcf64511 (diff)
Merge "JobSchedulerService - call PermissionEnforcer helper on methods annotated with @EnforcePermission"
-rw-r--r--apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
index e0df22c5e31d..6f58c7ce626c 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
@@ -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");
}