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

Merge "NoMan: Don't unbind system listeners" into lmp-preview-dev

Browse Source
This commit is contained in:
Christoph Studer
2014-05-28 12:10:34 +00:00
committed by Android (Google) Code Review
parent d3ee3ca90c 5d423844f2
commit 19a81a616f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/notification/ManagedServices.java
View File

@@ -259,13 +259,17 @@ abstract public class ManagedServices {
userIds[i]));
}
ManagedServiceInfo[] toRemove = new ManagedServiceInfo[mServices.size()];
ArrayList<ManagedServiceInfo> toRemove = new ArrayList<ManagedServiceInfo>();
final SparseArray<ArrayList<ComponentName>> toAdd
= new SparseArray<ArrayList<ComponentName>>();
synchronized (mMutex) {
// unbind and remove all existing services
toRemove = mServices.toArray(toRemove);
// Unbind automatically bound services, retain system services.
for (ManagedServiceInfo service : mServices) {
if (!service.isSystem) {
toRemove.add(service);
}
}
final ArraySet<ComponentName> newEnabled = new ArraySet<ComponentName>();
final ArraySet<String> newPackages = new ArraySet<String>();