Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev (651e09fd) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverActivity.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -668,12 +668,19 @@ public class ResolverActivity extends Activity {
		&& mAdapter.mOrigResolveList != null) {
		// Build a reasonable intent filter, based on what matched.
		IntentFilter filter = new IntentFilter();
		String action = intent.getAction();
		Intent filterIntent;

		if (intent.getSelector() != null) {
		filterIntent = intent.getSelector();
		} else {
		filterIntent = intent;
		}

		String action = filterIntent.getAction();
		if (action != null) {
		filter.addAction(action);
		}
		Set<String> categories = intent.getCategories();
		Set<String> categories = filterIntent.getCategories();
		if (categories != null) {
		for (String cat : categories) {
		filter.addCategory(cat);
		@@ -682,9 +689,9 @@ public class ResolverActivity extends Activity {
		filter.addCategory(Intent.CATEGORY_DEFAULT);

		int cat = ri.match & IntentFilter.MATCH_CATEGORY_MASK;
		Uri data = intent.getData();
		Uri data = filterIntent.getData();
		if (cat == IntentFilter.MATCH_CATEGORY_TYPE) {
		String mimeType = intent.resolveType(this);
		String mimeType = filterIntent.resolveType(this);
		if (mimeType != null) {
		try {
		filter.addDataType(mimeType);