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

Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev am: 395262cbb4

Browse Source 
Change-Id: I682d01f80318d832f163b3de69df26ec29cf4a22
This commit is contained in:
Automerger Merge Worker
2020-02-25 04:30:26 +00:00
parent 3384bb9a4d 395262cbb4
commit 45bfafd874
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -188,6 +188,7 @@ public class StatsPullAtomService extends SystemService {
private static final int MAX_BATTERY_STATS_HELPER_FREQUENCY_MS = 1000; private static final int MAX_BATTERY_STATS_HELPER_FREQUENCY_MS = 1000;
private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8; private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8;
private static final int OP_FLAGS_PULLED = OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXIED; private static final int OP_FLAGS_PULLED = OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXIED;
private static final String COMMON_PERMISSION_PREFIX = "android.permission.";
private final Object mNetworkStatsLock = new Object(); private final Object mNetworkStatsLock = new Object();
@GuardedBy("mNetworkStatsLock") @GuardedBy("mNetworkStatsLock")
@@ -2627,6 +2628,10 @@ public class StatsPullAtomService extends SystemService {
continue; continue;
} }
if (permName.startsWith(COMMON_PERMISSION_PREFIX)) {
permName = permName.substring(COMMON_PERMISSION_PREFIX.length());
}
StatsEvent.Builder e = StatsEvent.newBuilder(); StatsEvent.Builder e = StatsEvent.newBuilder();
e.setAtomId(atomTag); e.setAtomId(atomTag);
e.writeString(permName); e.writeString(permName);