Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev (fe470c37) · Commits · e / os / android_frameworks_base

services/java/com/android/server/pm/Settings.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -2070,9 +2070,11 @@ final class Settings {
		if (intent.getAction() != null) {
		filter.addAction(intent.getAction());
		}
		if (intent.getCategories() != null) {
		for (String cat : intent.getCategories()) {
		filter.addCategory(cat);
		}
		}
		if ((flags&PackageManager.MATCH_DEFAULT_ONLY) != 0) {
		filter.addCategory(Intent.CATEGORY_DEFAULT);
		}
		@@ -2088,6 +2090,13 @@ final class Settings {
		if (path != null) {
		filter.addDataPath(path);
		}
		if (intent.getType() != null) {
		try {
		filter.addDataType(intent.getType());
		} catch (IntentFilter.MalformedMimeTypeException ex) {
		Slog.w(TAG, "Malformed mimetype " + intent.getType() + " for " + cn);
		}
		}
		PreferredActivity pa = new PreferredActivity(filter, match, set, cn, true);
		editPreferredActivitiesLPw(userId).addFilter(pa);
		} else if (!haveNonSys) {