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

Commit ff3d2907 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

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

parents d1c9c078 97a609b8

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;

            }