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

Merge "Remove package name from the attribution tag." into rvc-dev am: c30e39377a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689596

Change-Id: I177e9d188adc5199939227536f4175cade82d797
This commit is contained in:
TreeHugger Robot
2020-06-11 13:45:11 +00:00
committed by Automerger Merge Worker
parent 4e33955a47 c30e39377a
commit 24ec797de4
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3577,7 +3577,16 @@ public class StatsPullAtomService extends SystemService {
private void processHistoricalOp(AppOpsManager.HistoricalOp op, private void processHistoricalOp(AppOpsManager.HistoricalOp op,
List<AppOpEntry> opsList, int uid, int samplingRatio, String packageName, List<AppOpEntry> opsList, int uid, int samplingRatio, String packageName,
@Nullable String attributionTag) { @Nullable String attributionTag) {
AppOpEntry entry = new AppOpEntry(packageName, attributionTag, op, uid); int firstChar = 0;
if (attributionTag != null && attributionTag.startsWith(packageName)) {
firstChar = packageName.length();
if (firstChar < attributionTag.length() && attributionTag.charAt(firstChar) == '.') {
firstChar++;
}
}
AppOpEntry entry = new AppOpEntry(packageName,
attributionTag == null ? null : attributionTag.substring(firstChar), op,
uid);
if (entry.mHash < samplingRatio) { if (entry.mHash < samplingRatio) {
opsList.add(entry); opsList.add(entry);
} }