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

Commit 36ea7c6c authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Fix indicator can't disappear in some cases" am: bd6308ac 

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



Change-Id: I9b122468405b44ec0f1b109a29ef61d598352d68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7085489 bd6308ac

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

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