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

Commit 29fae7b3 authored by Christoph Studer's avatar Christoph Studer Committed by Android Git Automerger
Browse files

am 1468841a: Merge "NoMan: Don\'t unbind system listeners" into lmp-preview-dev

* commit '1468841afc1431ddd0d3c843e41fa7a14c16e430':
  NoMan: Don't unbind system listeners
parents e0a88629 19a81a61
Loading
Loading
Loading
Loading
+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>();