Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I88c3fed1f069c7eed77b854dfcccb84dfdb327aa
This commit is contained in:
Chris Tate
2021-06-04 10:41:29 +00:00
committed by Automerger Merge Worker
parent 8636637660 80c24e4d81
commit 5718a06b0a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -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;
}