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

Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-03-27 17:11:35 +00:00
committed by Android (Google) Code Review
parent b5e754dd4d e824026554
commit fc680b8918
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -732,7 +732,7 @@ public class NotificationManagerService extends SystemService {
} }
} }
private NotificationListenerInfo checkListenerToken(INotificationListener listener) { private NotificationListenerInfo checkListenerTokenLocked(INotificationListener listener) {
checkNullListener(listener); checkNullListener(listener);
final IBinder token = listener.asBinder(); final IBinder token = listener.asBinder();
final int N = mListeners.size(); final int N = mListeners.size();
@@ -898,7 +898,10 @@ public class NotificationManagerService extends SystemService {
public void onClearAll() { public void onClearAll() {
// XXX to be totally correct, the caller should tell us which user // XXX to be totally correct, the caller should tell us which user
// this is for. // this is for.
cancelAll(ActivityManager.getCurrentUser()); int currentUser = ActivityManager.getCurrentUser();
synchronized (mNotificationList) {
cancelAllLocked(currentUser);
}
} }
@Override @Override
@@ -1502,10 +1505,12 @@ public class NotificationManagerService extends SystemService {
*/ */
@Override @Override
public void cancelAllNotificationsFromListener(INotificationListener token) { public void cancelAllNotificationsFromListener(INotificationListener token) {
NotificationListenerInfo info = checkListenerToken(token);
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
cancelAll(info.userid); synchronized (mNotificationList) {
NotificationListenerInfo info = checkListenerTokenLocked(token);
cancelAllLocked(info.userid);
}
} finally { } finally {
Binder.restoreCallingIdentity(identity); Binder.restoreCallingIdentity(identity);
} }
@@ -1521,9 +1526,12 @@ public class NotificationManagerService extends SystemService {
@Override @Override
public void cancelNotificationFromListener(INotificationListener token, String pkg, public void cancelNotificationFromListener(INotificationListener token, String pkg,
String tag, int id) { String tag, int id) {
NotificationListenerInfo info = checkListenerToken(token);
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
NotificationListenerInfo info;
synchronized (mNotificationList) {
info = checkListenerTokenLocked(token);
}
cancelNotification(pkg, tag, id, 0, cancelNotification(pkg, tag, id, 0,
Notification.FLAG_ONGOING_EVENT | Notification.FLAG_FOREGROUND_SERVICE, Notification.FLAG_ONGOING_EVENT | Notification.FLAG_FOREGROUND_SERVICE,
true, true,
@@ -1543,11 +1551,10 @@ public class NotificationManagerService extends SystemService {
@Override @Override
public StatusBarNotification[] getActiveNotificationsFromListener( public StatusBarNotification[] getActiveNotificationsFromListener(
INotificationListener token) { INotificationListener token) {
NotificationListenerInfo info = checkListenerToken(token);
StatusBarNotification[] result = new StatusBarNotification[0]; StatusBarNotification[] result = new StatusBarNotification[0];
ArrayList<StatusBarNotification> list = new ArrayList<StatusBarNotification>(); ArrayList<StatusBarNotification> list = new ArrayList<StatusBarNotification>();
synchronized (mNotificationList) { synchronized (mNotificationList) {
NotificationListenerInfo info = checkListenerTokenLocked(token);
final int N = mNotificationList.size(); final int N = mNotificationList.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
StatusBarNotification sbn = mNotificationList.get(i).sbn; StatusBarNotification sbn = mNotificationList.get(i).sbn;
@@ -2369,25 +2376,23 @@ public class NotificationManagerService extends SystemService {
} }
} }
void cancelAll(int userId) { void cancelAllLocked(int userId) {
synchronized (mNotificationList) { final int N = mNotificationList.size();
final int N = mNotificationList.size(); for (int i=N-1; i>=0; i--) {
for (int i=N-1; i>=0; i--) { NotificationRecord r = mNotificationList.get(i);
NotificationRecord r = mNotificationList.get(i);
if (!notificationMatchesUserId(r, userId)) { if (!notificationMatchesUserId(r, userId)) {
continue; continue;
}
if ((r.getFlags() & (Notification.FLAG_ONGOING_EVENT
| Notification.FLAG_NO_CLEAR)) == 0) {
mNotificationList.remove(i);
cancelNotificationLocked(r, true);
}
} }
updateLightsLocked(); if ((r.getFlags() & (Notification.FLAG_ONGOING_EVENT
| Notification.FLAG_NO_CLEAR)) == 0) {
mNotificationList.remove(i);
cancelNotificationLocked(r, true);
}
} }
updateLightsLocked();
} }
// lock on mNotificationList // lock on mNotificationList