Merge "Revert "Restore preferred activity filter if it not inside"" am: e6439f8866 (248bfa3d) · Commits · e / os / android_frameworks_base

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

+0 −37

Original line number	Diff line number	Diff line
		@@ -254,43 +254,6 @@ 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;

+0 −21

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

		import com.android.server.IntentResolver;
		import java.util.ArrayList;

		public class PreferredIntentResolver
		extends IntentResolver<PreferredActivity, PreferredActivity> {
		@@ -46,24 +45,4 @@ 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;
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -1410,7 +1410,8 @@ public final class Settings {
		PreferredActivity pa = new PreferredActivity(parser);
		if (pa.mPref.getParseError() == null) {
		final PreferredIntentResolver resolver = editPreferredActivitiesLPw(userId);
		if (resolver.shouldAddPreferredActivity(pa)) {
		ArrayList<PreferredActivity> pal = resolver.findFilters(pa);
		if (pal == null \|\| pal.size() == 0 \|\| pa.mPref.mAlways) {
		resolver.addFilter(pa);
		}
		} else {