Merge change 1866 into donut (3a00d763) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -180,8 +180,7 @@ public class IntentResolver<F extends IntentFilter, R extends Object> {
		return resultList;
		}

		public List<R> queryIntent(ContentResolver resolver, Intent intent,
		String resolvedType, boolean defaultOnly) {
		public List<R> queryIntent(Intent intent, String resolvedType, boolean defaultOnly) {
		String scheme = intent.getScheme();

		ArrayList<R> finalList = new ArrayList<R>();

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

+12 −20

Original line number	Diff line number	Diff line
		@@ -1270,8 +1270,7 @@ class PackageManagerService extends IPackageManager.Stub {
		synchronized (mPackages) {
		if (DEBUG_PREFERRED) intent.addFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION);
		List<PreferredActivity> prefs =
		mSettings.mPreferredActivities.queryIntent(null,
		intent, resolvedType,
		mSettings.mPreferredActivities.queryIntent(intent, resolvedType,
		(flags&PackageManager.MATCH_DEFAULT_ONLY) != 0);
		if (prefs != null && prefs.size() > 0) {
		// First figure out how good the original match set is.
		@@ -1348,7 +1347,7 @@ class PackageManagerService extends IPackageManager.Stub {

		synchronized (mPackages) {
		return (List<ResolveInfo>)mActivities.
		queryIntent(null, intent, resolvedType, flags);
		queryIntent(intent, resolvedType, flags);
		}
		}

		@@ -1517,7 +1516,7 @@ class PackageManagerService extends IPackageManager.Stub {
		String resolvedType, int flags) {
		synchronized (mPackages) {
		return (List<ResolveInfo>)mReceivers.
		queryIntent(null, intent, resolvedType, flags);
		queryIntent(intent, resolvedType, flags);
		}
		}

		@@ -1550,8 +1549,7 @@ class PackageManagerService extends IPackageManager.Stub {
		}

		synchronized (mPackages) {
		return (List<ResolveInfo>)mServices.
		queryIntent(null, intent, resolvedType, flags);
		return (List<ResolveInfo>)mServices.queryIntent(intent, resolvedType, flags);
		}
		}

		@@ -2881,17 +2879,14 @@ class PackageManagerService extends IPackageManager.Stub {

		private final class ActivityIntentResolver
		extends IntentResolver<PackageParser.ActivityIntentInfo, ResolveInfo> {
		public List queryIntent(ContentResolver resolver, Intent intent,
		String resolvedType, boolean defaultOnly) {
		public List queryIntent(Intent intent, String resolvedType, boolean defaultOnly) {
		mFlags = defaultOnly ? PackageManager.MATCH_DEFAULT_ONLY : 0;
		return super.queryIntent(resolver, intent, resolvedType, defaultOnly);
		return super.queryIntent(intent, resolvedType, defaultOnly);
		}

		public List queryIntent(ContentResolver resolver, Intent intent,
		String resolvedType, int flags) {
		public List queryIntent(Intent intent, String resolvedType, int flags) {
		mFlags = flags;
		return super.queryIntent(
		resolver, intent, resolvedType,
		return super.queryIntent(intent, resolvedType,
		(flags&PackageManager.MATCH_DEFAULT_ONLY) != 0);
		}

		@@ -3025,17 +3020,14 @@ class PackageManagerService extends IPackageManager.Stub {

		private final class ServiceIntentResolver
		extends IntentResolver<PackageParser.ServiceIntentInfo, ResolveInfo> {
		public List queryIntent(ContentResolver resolver, Intent intent,
		String resolvedType, boolean defaultOnly) {
		public List queryIntent(Intent intent, String resolvedType, boolean defaultOnly) {
		mFlags = defaultOnly ? PackageManager.MATCH_DEFAULT_ONLY : 0;
		return super.queryIntent(resolver, intent, resolvedType, defaultOnly);
		return super.queryIntent(intent, resolvedType, defaultOnly);
		}

		public List queryIntent(ContentResolver resolver, Intent intent,
		String resolvedType, int flags) {
		public List queryIntent(Intent intent, String resolvedType, int flags) {
		mFlags = flags;
		return super.queryIntent(
		resolver, intent, resolvedType,
		return super.queryIntent(intent, resolvedType,
		(flags&PackageManager.MATCH_DEFAULT_ONLY) != 0);
		}

services/java/com/android/server/am/ActivityManagerService.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -10176,8 +10176,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		}
		}

		final ContentResolver resolver = mContext.getContentResolver();

		// Figure out who all will receive this broadcast.
		List receivers = null;
		List<BroadcastFilter> registeredReceivers = null;
		@@ -10200,8 +10198,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		ActivityThread.getPackageManager().queryIntentReceivers(
		intent, resolvedType, STOCK_PM_FLAGS);
		}
		registeredReceivers = mReceiverResolver.queryIntent(resolver,
		intent, resolvedType, false);
		registeredReceivers = mReceiverResolver.queryIntent(intent, resolvedType, false);
		}
		} catch (RemoteException ex) {
		// pm is in same process, this will never happen.