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

Commit bcbda696 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "Restore preferred activity filter if it not inside" am: d8c6106f am:... 

Merge "Restore preferred activity filter if it not inside" am: d8c6106f am: d45305b2 am: fcf66c36 am: a20b451c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483964

Change-Id: I4641334342290bd097ea6bccf3f248ede2c6e9b0
parents 634e7e31 a20b451c

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

+37 −0
Original line number Diff line number Diff line
@@ -256,6 +256,43 @@ public class PreferredComponent { 
        return numMatch == NS;

    }



    public boolean sameSet(PreferredComponent pc) {

        if (mSetPackages == null || pc == null || pc.mSetPackages == null

                || !sameComponent(pc.mComponent)) {

            return false;

        }

        final int otherPackageCount = pc.mSetPackages.length;

        final int packageCount = mSetPackages.length;

        int numMatch = 0;

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

            boolean good = false;

            for (int j = 0; j < packageCount; j++) {

                if (mSetPackages[j].equals(pc.mSetPackages[j])

                        && mSetClasses[j].equals(pc.mSetClasses[j])) {

                    numMatch++;

                    good = true;

                    break;

                }

            }

            if (!good) {

                return false;

            }

        }

        return numMatch == packageCount;

    }



    /** Returns true if the preferred component represents the provided ComponentName. */

    private boolean sameComponent(ComponentName comp) {

        if (mComponent == null || comp == null) {

            return false;

        }

        if (mComponent.getPackageName().equals(comp.getPackageName())

                && mComponent.getClassName().equals(comp.getClassName())) {

            return true;

        }

        return false;

    }



    public boolean isSuperset(List<ResolveInfo> query, boolean excludeSetupWizardPackage) {

        if (mSetPackages == null) {

            return query == null;

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

+21 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.IntentFilter; 
import java.io.PrintWriter;



import com.android.server.IntentResolver;

import java.util.ArrayList;



public class PreferredIntentResolver

        extends IntentResolver<PreferredActivity, PreferredActivity> {
@@ -45,4 +46,24 @@ public class PreferredIntentResolver 
    protected IntentFilter getIntentFilter(@NonNull PreferredActivity input) {

        return input;

    }



    public boolean shouldAddPreferredActivity(PreferredActivity pa) {

        ArrayList<PreferredActivity> pal = findFilters(pa);

        if (pal == null || pal.isEmpty()) {

            return true;

        }

        if (!pa.mPref.mAlways) {

            return false;

        }

        final int activityCount = pal.size();

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

            PreferredActivity cur = pal.get(i);

            if (cur.mPref.mAlways

                    && cur.mPref.mMatch == (pa.mPref.mMatch & IntentFilter.MATCH_CATEGORY_MASK)

                    && cur.mPref.sameSet(pa.mPref)) {

                return false;

            }

        }

        return true;

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -1312,8 +1312,7 @@ public final class Settings { 
                PreferredActivity pa = new PreferredActivity(parser);

                if (pa.mPref.getParseError() == null) {

                    final PreferredIntentResolver resolver = editPreferredActivitiesLPw(userId);

                    ArrayList<PreferredActivity> pal = resolver.findFilters(pa);

                    if (pal == null || pal.size() == 0 || pa.mPref.mAlways) {

                    if (resolver.shouldAddPreferredActivity(pa)) {

                        resolver.addFilter(pa);

                    }

                } else {