Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3a00d763: Merge change 1866 into donut

Browse Source 
Merge commit '3a00d763dfb22982987e08f4c8751fe68451ed0d'

* commit '3a00d763dfb22982987e08f4c8751fe68451ed0d':
  remove unused ContentResolver parameter from IntentResolver.queryIntent.
This commit is contained in:
Android (Google) Code Review
2009-05-18 10:39:02 -07:00
committed by The Android Open Source Project
parent 3e9b3eae7c 3a00d763df
commit e9e95e6f8e
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/IntentResolver.java
View File

@@ -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>();

32
services/java/com/android/server/PackageManagerService.java
View File

@@ -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);
}
}
@@ -2884,17 +2882,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);
}
@@ -3028,17 +3023,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);
}

5
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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.