Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94bdf23d authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b am: 84f287bb 

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



Change-Id: I4385c82ff77c58e595fb6d258ef70a81c14d7aa9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c252daf 84f287bb

packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {