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

Merge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2016-08-04 21:56:24 +00:00
committed by Android (Google) Code Review
parent a4b89c054c 569a45871c
commit a96e7ac463
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -748,7 +748,7 @@ public final class ActiveServices {
if (sm != null) {
for (int i = sm.mServicesByName.size()-1; i >= 0; i--) {
ServiceRecord other = sm.mServicesByName.valueAt(i);
if (other.foregroundId == r.foregroundId
if (other != r && other.foregroundId == r.foregroundId
&& other.packageName.equals(r.packageName)) {
// Found one! Abort the cancel.
return;