Merge "Fix double adding of special attribution usage" into sc-dev

2021-02-11 23:18:37 +00:00
parent 8d6a0cb6af f187670270
commit bbeeeefc70
1 changed files with 5 additions and 4 deletions
--- a/core/java/android/permission/PermissionUsageHelper.java
+++ b/core/java/android/permission/PermissionUsageHelper.java
@@ -693,13 +693,14 @@ public class PermissionUsageHelper {
        for (int usageNum = 0; usageNum < rawUsages.size(); usageNum++) {
            OpUsage usage = rawUsages.get(usageNum);

+            // If this attribution is a proxy, remove it
+            if (toRemoveProxies.contains(usage.toPackageAttr())) {
+                continue;
+            }
+
            // If this attribution has a special attribution, do not remove it
            if (specialAttributions.contains(usage.toPackageAttr())) {
                deDuped.add(usage);
-            }
-
-            // If this attribution is a proxy, remove it
-            if (toRemoveProxies.contains(usage.toPackageAttr())) {
                continue;
            }