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

Ensure removeForegroundService checks both lists under lock

Browse Source 
Prior CL didn't lock properly and would still fail if a
notification was both enqueued and posted at the same time.

Test: runtest systemui-notification
Change-Id: I1bdd779ecb872f1a02ffc38b6007239eb522b521
Fixes: 36550043
This commit is contained in:
Geoffrey Pitsch
2017-04-13 13:44:09 -04:00
parent 061db23b79
commit 87237d70a5
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -3071,32 +3071,34 @@ public class NotificationManagerService extends SystemService {
public void removeForegroundServiceFlagFromNotification(String pkg, int notificationId,
int userId) {
checkCallerIsSystem();
synchronized (mNotificationLock) {
mHandler.post(new Runnable() {
@Override
public void run() {
NotificationRecord r =
findNotificationLocked(pkg, null, notificationId, userId);
if (r == null) {
Log.d(TAG,
"stripForegroundServiceFlag: Could not find notification with "
+ "pkg=" + pkg + " / id=" + notificationId
+ " / userId=" + userId);
return;
}
StatusBarNotification sbn = r.sbn;
// NoMan adds flags FLAG_NO_CLEAR and FLAG_ONGOING_EVENT when it sees
// FLAG_FOREGROUND_SERVICE. Hence it's not enough to remove
// FLAG_FOREGROUND_SERVICE, we have to revert to the flags we received
// initially *and* force remove FLAG_FOREGROUND_SERVICE.
sbn.getNotification().flags =
(r.mOriginalFlags & ~Notification.FLAG_FOREGROUND_SERVICE);
mRankingHelper.sort(mNotificationList);
mListeners.notifyPostedLocked(sbn, sbn /* oldSbn */);
mGroupHelper.onNotificationPosted(sbn);
mHandler.post(new Runnable() {
@Override
public void run() {
synchronized (mNotificationLock) {
removeForegroundServiceFlagByListLocked(mEnqueuedNotifications, pkg, notificationId, userId);
removeForegroundServiceFlagByListLocked(mNotificationList, pkg, notificationId, userId);
}
});
}
});
}
private void removeForegroundServiceFlagByListLocked(
ArrayList<NotificationRecord> notificationList, String pkg, int notificationId, int userId) {
NotificationRecord r =
findNotificationByListLocked(notificationList, pkg, null, notificationId, userId);
if (r == null) {
return;
}
StatusBarNotification sbn = r.sbn;
// NoMan adds flags FLAG_NO_CLEAR and FLAG_ONGOING_EVENT when it sees
// FLAG_FOREGROUND_SERVICE. Hence it's not enough to remove
// FLAG_FOREGROUND_SERVICE, we have to revert to the flags we received
// initially *and* force remove FLAG_FOREGROUND_SERVICE.
sbn.getNotification().flags =
(r.mOriginalFlags & ~Notification.FLAG_FOREGROUND_SERVICE);
mRankingHelper.sort(mNotificationList);
mListeners.notifyPostedLocked(sbn, sbn /* oldSbn */);
mGroupHelper.onNotificationPosted(sbn);
}
};