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

Commit 302f62ce authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge "Convert IntentResolver data object to IntentFilter for comparison" into rvc-dev

parents 82e82762 3802e39d

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);