drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev

Browse Source 
* commit '41044e5e8ef3ade33ae5d6377beca5852851a16b':
  Maintain binding to crashed listeners from NotificationManagerService.
This commit is contained in:
Will Haldean Brown
2014-02-28 22:30:31 +00:00
committed by Android Git Automerger
parent 7842cff88d 41044e5e8e
commit 9d50308b3e
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,10 +258,11 @@ public class NotificationManagerService extends SystemService {
@Override
public void binderDied() {
if (connection == null) {
// This is not a service; it won't be recreated. We can give up this connection.
unregisterListenerImpl(this.listener, this.userid);
}
// Remove the listener, but don't unbind from the service. The system will bring the
// service back up, and the onServiceConnected handler will readd the listener with the
// new binding. If this isn't a bound service, and is just a registered
// INotificationListener, just removing it from the list is all we need to do anyway.
removeListenerImpl(this.listener, this.userid);
}
/** convenience method for looking in mEnabledListenersForCurrentUser */
@ -1999,20 +2000,35 @@ public class NotificationManagerService extends SystemService {
}
}
/**
* Removes a listener from the list and unbinds from its service.
*/
void unregisterListenerImpl(final INotificationListener listener, final int userid) {
NotificationListenerInfo info = removeListenerImpl(listener, userid);
if (info != null && info.connection != null) {
getContext().unbindService(info.connection);
}
}
/**
* Removes a listener from the list but does not unbind from the listener's service.
*
* @return the removed listener.
*/
NotificationListenerInfo removeListenerImpl(
final INotificationListener listener, final int userid) {
NotificationListenerInfo listenerInfo = null;
synchronized (mNotificationList) {
final int N = mListeners.size();
for (int i=N-1; i>=0; i--) {
final NotificationListenerInfo info = mListeners.get(i);
if (info.listener.asBinder() == listener.asBinder()
&& info.userid == userid) {
mListeners.remove(i);
if (info.connection != null) {
getContext().unbindService(info.connection);
}
listenerInfo = mListeners.remove(i);
}
}
}
return listenerInfo;
}
void showNextToastLocked() {