From d84a0bd79d9f03fd64389b1d8238b5ed301cc847 Mon Sep 17 00:00:00 2001 From: mattgilbride Date: Sat, 5 Nov 2022 19:50:38 +0000 Subject: [PATCH] UsageStatsService - call PermissionEnforcer helper on methods annotated with @EnforcePermission Migrates all existing java methods annotated with @EnforcePermission such that they call the super._enforcePermission method provided by PermissionEnforcer. This required by the @EnforcePermission annotation, but is currently a no-op, and will be switched on with ag/20325484. Bug: 234083358 Test: TH Change-Id: I44f229a9f9b3483e638d2fe7ce49d7093f1fa5db --- .../java/com/android/server/usage/UsageStatsService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 7f5beb1f6cf0b..4fd2b78b6f66f 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -2392,6 +2392,8 @@ public class UsageStatsService extends SystemService implements @Override public void setAppStandbyBucket(String packageName, int bucket, int userId) { + super.setAppStandbyBucket_enforcePermission(); + final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); final long token = Binder.clearCallingIdentity(); @@ -2442,6 +2444,8 @@ public class UsageStatsService extends SystemService implements @Override public void setAppStandbyBuckets(ParceledListSlice appBuckets, int userId) { + super.setAppStandbyBuckets_enforcePermission(); + final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); final long token = Binder.clearCallingIdentity(); @@ -2493,6 +2497,8 @@ public class UsageStatsService extends SystemService implements public void setEstimatedLaunchTime(String packageName, long estimatedLaunchTime, int userId) { + super.setEstimatedLaunchTime_enforcePermission(); + final long token = Binder.clearCallingIdentity(); try { UsageStatsService.this @@ -2506,6 +2512,8 @@ public class UsageStatsService extends SystemService implements @Override public void setEstimatedLaunchTimes(ParceledListSlice estimatedLaunchTimes, int userId) { + super.setEstimatedLaunchTimes_enforcePermission(); + final long token = Binder.clearCallingIdentity(); try { UsageStatsService.this