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

Commit 821ba23d authored by Chris Tate's avatar Chris Tate Committed by Automerger Merge Worker
Browse files

Merge "Fix false-positive matching of notification to FGS" into sc-dev am: ff3d2907 

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

Change-Id: Ib0de9b778ba6ed96bea1240c50db2ecc55d76a9f
parents f49177c8 ff3d2907

services/core/java/com/android/server/am/ActiveServices.java

+3 −1
Original line number Diff line number Diff line
@@ -2005,7 +2005,9 @@ public final class ActiveServices { 


        for (int i = 0; i < smap.mServicesByInstanceName.size(); i++) {

            final ServiceRecord sr = smap.mServicesByInstanceName.valueAt(i);

            if (id != sr.foregroundId || !pkg.equals(sr.appInfo.packageName)) {

            if (!sr.isForeground

                    || id != sr.foregroundId

                    || !pkg.equals(sr.appInfo.packageName)) {

                // Not this one; keep looking

                continue;

            }