Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d423844 authored by Christoph Studer's avatar Christoph Studer
Browse files

NoMan: Don't unbind system listeners 

Listeners registered via INotificationMananger.registerListener()
must not be unbound by NoMan because it won't be able to re-bind
them later.

Bug: 15131411
Change-Id: Ic5088252c86e7c32c522ba1606f123cefde3720d
parent 7d7090d6

services/core/java/com/android/server/notification/ManagedServices.java

+7 −3
Original line number Diff line number Diff line
@@ -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>();