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

Commit 021cf1f8 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... 

Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b am: 796c9aa1 am: 4111c64b

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



Change-Id: If96b992e92a7c8684781cb77a378a5bf4726fc6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48d5b372 4111c64b

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