Merge "Correct the priority for protected actions" (47a1c324) · Commits · e / os / android_frameworks_base

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

+42 −41

Original line number	Diff line number	Diff line
		@@ -890,8 +890,6 @@ public class ComponentResolver {
		return;
		}

		if (systemActivities == null) {
		// the system package is not disabled; we're parsing the system partition
		if (isProtectedAction(intent)) {
		if (mDeferProtectedFilters) {
		// We can't deal with these just yet. No component should ever obtain a
		@@ -911,7 +909,6 @@ public class ComponentResolver {
		+ " activity: " + className
		+ " origPrio: " + intent.getPriority());
		}
		return;
		} else {
		if (DEBUG_FILTERS && setupWizardPackage == null) {
		Slog.i(TAG, "No setup wizard;"
		@@ -935,9 +932,13 @@ public class ComponentResolver {
		+ " origPrio: " + intent.getPriority());
		}
		intent.setPriority(0);
		return;
		}
		return;
		}

		if (systemActivities == null) {
		// the system package is not disabled; we're parsing the system partition

		// privileged apps on the system image get whatever priority they request
		return;
		}