commit ff3d2907e81e814b43a11c3327caed359f9c41b8
author Chris Tate <ctate@android.com> Thu Jun 03 21:39:11 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 03 21:39:11 2021 +0000
tree fef6af63620a2db944d7568c41386fa416578d76
parent d1c9c0785cbaabd04f278561e881d2bc9c94e5e9
parent 97a609b82c7ee97cad0cdce853a8408a36b6ba78

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

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

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 144ab9b..c40ab9b 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -2005,7 +2005,9 @@
 
         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;
             }