From 6fa6a807a52c2895fb63f9c5ef3a449b8b7f1f2d Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com>
Date: Thu, 21 Jan 2021 10:44:07 -0800
Subject: [PATCH] Do not look at self when comparing for duplicate usage

When looking for duplicate usages, do not compare to self

Fixes: 178088373
Test: manual
Change-Id: I5e7316caff5ff33017cd868324c066a3f3e99bd6
---
 core/java/android/permission/PermissionUsageHelper.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/permission/PermissionUsageHelper.java b/core/java/android/permission/PermissionUsageHelper.java
index c28b59ba9aac0..db55e1c7afda0 100644
--- a/core/java/android/permission/PermissionUsageHelper.java
+++ b/core/java/android/permission/PermissionUsageHelper.java
@@ -662,6 +662,11 @@ public class PermissionUsageHelper {
             // usage for that uid, keep it. Otherwise, remove it
             boolean isMostRecentForUid = true;
             for (int otherUsageNum = 0; otherUsageNum < rawUsages.size(); otherUsageNum++) {
+                // Do not compare this usage to itself
+                if (otherUsageNum == usageNum) {
+                    continue;
+                }
+
                 OpUsage otherUsage = rawUsages.get(otherUsageNum);
                 if (otherUsage.uid == usage.uid) {
                     if (otherUsage.isRunning && !usage.isRunning) {