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

Commit 0b83b24e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Convert IntentResolver data object to IntentFilter for comparison" into... 

Merge "Convert IntentResolver data object to IntentFilter for comparison" into rvc-dev am: 302f62ce

Change-Id: I666923d7748353d8976fc9f51343d20501e01960
parents 46c93546 302f62ce

services/core/java/com/android/server/IntentResolver.java

+3 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ public abstract class IntentResolver<F, R extends Object> { 
    }



    private final void remove_all_objects(ArrayMap<String, F[]> map, String name,

            Object object) {

            F object) {

        F[] array = map.get(name);

        if (array != null) {

            int LAST = array.length-1;
@@ -695,7 +695,8 @@ public abstract class IntentResolver<F, R extends Object> { 
                LAST--;

            }

            for (int idx=LAST; idx>=0; idx--) {

                if (array[idx] == object) {

                F arrayValue = array[idx];

                if (arrayValue != null && getIntentFilter(arrayValue) == getIntentFilter(object)) {

                    final int remain = LAST - idx;

                    if (remain > 0) {

                        System.arraycopy(array, idx+1, array, idx, remain);