From c32db2d0511e2b2aec9ee6ccb1ff347cfcf64511 Mon Sep 17 00:00:00 2001 From: mattgilbride Date: Thu, 8 Dec 2022 17:33:18 +0000 Subject: [PATCH] JobSchedulerService - call PermissionEnforcer helper on methods annotated with @EnforcePermission All java methods annotated with @EnforcePermission must call super._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 --- .../java/com/android/server/job/JobSchedulerService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 ad6eff07b9779..0a3624a6b299e 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -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"); }