Merge "Fix double adding of special attribution usage" into sc-dev (bbeeeefc) · Commits · e / os / android_frameworks_base

core/java/android/permission/PermissionUsageHelper.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}