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

2021-06-03 21:39:11 +00:00
parent d1c9c0785c 97a609b82c
commit ff3d2907e8
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -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;
            }