Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b54

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

Change-Id: I0f1077a4ad2605d59ebd8aa459405cd8d2130d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2022-05-11 20:48:30 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {