diff options
| author | 2022-05-11 20:46:21 +0000 | |
|---|---|---|
| committer | 2022-05-11 20:46:21 +0000 | |
| commit | 882e36e24c9cf47193f887f79d8c185d2aa1c72c (patch) | |
| tree | bc934b73d21a28bcfc15b61dad22e500542535ba | |
| parent | 9340be20d6bda9c1a0c549da8b7992263c147984 (diff) | |
| parent | b2b75d9b54e448a1d38a43775db205ef2ebd62ce (diff) | |
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: Ie9f8f5ad90f983a4f3565306d80bbb9cb644b324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java index 56fbe6d9bf14..c10fafeac8b4 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) { |