Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Gilbride
2022-11-05 19:52:56 +00:00
committed by Android (Google) Code Review
parent 059b3162b3 dbecd4db68
commit 84b062e919
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ProcessStatsService.java
View File

@@ -567,6 +567,8 @@ public final class ProcessStatsService extends IProcessStats.Stub {
@android.annotation.EnforcePermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
@Override
public byte[] getCurrentStats(List<ParcelFileDescriptor> historic) {
super.getCurrentStats_enforcePermission();
Parcel current = Parcel.obtain();
synchronized (mLock) {
long now = SystemClock.uptimeMillis();
@@ -623,6 +625,8 @@ public final class ProcessStatsService extends IProcessStats.Stub {
public long getCommittedStatsMerged(long highWaterMarkMs, int section, boolean doAggregate,
List<ParcelFileDescriptor> committedStats, ProcessStats mergedStats) {
super.getCommittedStatsMerged_enforcePermission();
long newHighWaterMark = highWaterMarkMs;
mFileLock.lock();
try {
@@ -709,6 +713,8 @@ public final class ProcessStatsService extends IProcessStats.Stub {
@android.annotation.EnforcePermission(android.Manifest.permission.PACKAGE_USAGE_STATS)
@Override
public ParcelFileDescriptor getStatsOverTime(long minTime) {
super.getStatsOverTime_enforcePermission();
Parcel current = Parcel.obtain();
long curTime;
synchronized (mLock) {