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

Commit 22e5b5a4 authored by Kholoud Mohamed's avatar Kholoud Mohamed
Browse files

Move IntentResolver#filterEquals to IntentFilter 

This is needed so that it can be called client side.

Bug: 232918480
Test: builds succefully
Change-Id: Iac7076d3c4018a7a2fe3e464bda91633447a0a7e
parent 262d2db5

core/java/android/content/IntentFilter.java

+77 −0
Original line number Diff line number Diff line
@@ -3039,4 +3039,81 @@ public class IntentFilter implements Parcelable { 
        ArrayList<String> list = getHostsList();

        return list.toArray(new String[list.size()]);

    }



    /**

     * @hide

     */

    public static boolean filterEquals(IntentFilter f1, IntentFilter f2) {

        int s1 = f1.countActions();

        int s2 = f2.countActions();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasAction(f1.getAction(i))) {

                return false;

            }

        }

        s1 = f1.countCategories();

        s2 = f2.countCategories();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasCategory(f1.getCategory(i))) {

                return false;

            }

        }

        s1 = f1.countDataTypes();

        s2 = f2.countDataTypes();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasExactDataType(f1.getDataType(i))) {

                return false;

            }

        }

        s1 = f1.countDataSchemes();

        s2 = f2.countDataSchemes();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataScheme(f1.getDataScheme(i))) {

                return false;

            }

        }

        s1 = f1.countDataAuthorities();

        s2 = f2.countDataAuthorities();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataAuthority(f1.getDataAuthority(i))) {

                return false;

            }

        }

        s1 = f1.countDataPaths();

        s2 = f2.countDataPaths();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataPath(f1.getDataPath(i))) {

                return false;

            }

        }

        s1 = f1.countDataSchemeSpecificParts();

        s2 = f2.countDataSchemeSpecificParts();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataSchemeSpecificPart(f1.getDataSchemeSpecificPart(i))) {

                return false;

            }

        }

        return true;

    }

}

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

+2 −76
Original line number Diff line number Diff line
@@ -77,80 +77,6 @@ public abstract class IntentResolver<F, R extends Object> { 
        }

    }



    public static boolean filterEquals(IntentFilter f1, IntentFilter f2) {

        int s1 = f1.countActions();

        int s2 = f2.countActions();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasAction(f1.getAction(i))) {

                return false;

            }

        }

        s1 = f1.countCategories();

        s2 = f2.countCategories();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasCategory(f1.getCategory(i))) {

                return false;

            }

        }

        s1 = f1.countDataTypes();

        s2 = f2.countDataTypes();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasExactDataType(f1.getDataType(i))) {

                return false;

            }

        }

        s1 = f1.countDataSchemes();

        s2 = f2.countDataSchemes();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataScheme(f1.getDataScheme(i))) {

                return false;

            }

        }

        s1 = f1.countDataAuthorities();

        s2 = f2.countDataAuthorities();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataAuthority(f1.getDataAuthority(i))) {

                return false;

            }

        }

        s1 = f1.countDataPaths();

        s2 = f2.countDataPaths();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataPath(f1.getDataPath(i))) {

                return false;

            }

        }

        s1 = f1.countDataSchemeSpecificParts();

        s2 = f2.countDataSchemeSpecificParts();

        if (s1 != s2) {

            return false;

        }

        for (int i=0; i<s1; i++) {

            if (!f2.hasDataSchemeSpecificPart(f1.getDataSchemeSpecificPart(i))) {

                return false;

            }

        }

        return true;

    }



    /**

     * Returns whether an intent matches the IntentFilter with a pre-resolved type.

     */
@@ -200,7 +126,7 @@ public abstract class IntentResolver<F, R extends Object> { 
                if (cur == null) {

                    break;

                }

                if (filterEquals(getIntentFilter(cur), matching)) {

                if (IntentFilter.filterEquals(getIntentFilter(cur), matching)) {

                    if (res == null) {

                        res = new ArrayList<>();

                    }
@@ -225,7 +151,7 @@ public abstract class IntentResolver<F, R extends Object> { 
        } else {

            ArrayList<F> res = null;

            for (F cur : mFilters) {

                if (filterEquals(getIntentFilter(cur), matching)) {

                if (IntentFilter.filterEquals(getIntentFilter(cur), matching)) {

                    if (res == null) {

                        res = new ArrayList<>();

                    }

services/core/java/com/android/server/am/ReceiverList.java

+1 −3
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import android.util.PrintWriterPrinter; 
import android.util.Printer;

import android.util.proto.ProtoOutputStream;



import com.android.server.IntentResolver;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -74,7 +72,7 @@ final class ReceiverList extends ArrayList<BroadcastFilter> 
        final int N = size();

        for (int i = 0; i < N; i++) {

            final BroadcastFilter f = get(i);

            if (IntentResolver.filterEquals(f, filter)) {

            if (IntentFilter.filterEquals(f, filter)) {

                return true;

            }

        }

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ import com.android.modules.utils.TypedXmlSerializer; 
import com.android.permission.persistence.RuntimePermissionsPersistence;

import com.android.server.EventLogTags;

import com.android.server.FgThread;

import com.android.server.IntentResolver;

import com.android.server.LocalManagerRegistry;

import com.android.server.LocalServices;

import com.android.server.LockGuard;
@@ -4775,7 +4774,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                ArraySet<CrossProfileIntentFilter> set =

                        new ArraySet<>(resolver.filterSet());

                for (CrossProfileIntentFilter filter : set) {

                    if (IntentResolver.filterEquals(filter.mFilter, intentFilter)

                    if (IntentFilter.filterEquals(filter.mFilter, intentFilter)

                            && filter.getOwnerPackage().equals(ownerPackage)

                            && filter.getTargetUserId() == targetUserId

                            && filter.getFlags() == flags) {

services/core/java/com/android/server/pm/Settings.java

+1 −2
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ import com.android.modules.utils.TypedXmlPullParser; 
import com.android.modules.utils.TypedXmlSerializer;

import com.android.permission.persistence.RuntimePermissionsPersistence;

import com.android.permission.persistence.RuntimePermissionsState;

import com.android.server.IntentResolver;

import com.android.server.LocalServices;

import com.android.server.backup.PreferredActivityBackupHelper;

import com.android.server.pm.Installer.InstallerException;
@@ -6307,7 +6306,7 @@ public final class Settings implements Watchable, Snappable { 
        boolean changed = false;

        while (it.hasNext()) {

            PersistentPreferredActivity ppa = it.next();

            if (IntentResolver.filterEquals(ppa.getIntentFilter(), filter)) {

            if (IntentFilter.filterEquals(ppa.getIntentFilter(), filter)) {

                ppir.removeFilter(ppa);

                changed = true;

                break;