From e1beb1b33a409fb6c469c2a4bc181c130aebb44e Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com>
Date: Thu, 28 Apr 2022 14:54:29 -0700
Subject: [PATCH] Fix indicator not removing in certain cases

This is an internal CP of aosp/2041184

Test: manual
Bug: 227647076
Change-Id: I72680218e7147281ded8305154ba7ccd2aea7a7e
Merged-In: I1fe5eb2dcb216ab18907ecbcb3a58edf27b3c21f
---
 .../src/com/android/systemui/appops/AppOpsControllerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
index 56fbe6d9bf143..c10fafeac8b4a 100644
--- a/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
@@ -375,7 +375,7 @@ public class AppOpsControllerImpl extends BroadcastReceiver implements AppOpsCon
             Log.w(TAG, String.format("onActiveChanged(%d,%d,%s,%s,%d,%d)", code, uid, packageName,
                     Boolean.toString(active), attributionChainId, attributionFlags));
         }
-        if (attributionChainId != AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE
+        if (active && attributionChainId != AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE
                 && attributionFlags != AppOpsManager.ATTRIBUTION_FLAGS_NONE
                 && (attributionFlags & AppOpsManager.ATTRIBUTION_FLAG_ACCESSOR) == 0
                 && (attributionFlags & AppOpsManager.ATTRIBUTION_FLAG_TRUSTED) == 0) {