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

am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev

Browse Source 
* commit 'fe470c37deda6b1d51b0a208ae31e101e90c7e1b':
  Have the package manager write mimetype of preferred activities to xml.
This commit is contained in:
Erin Dahlgren
2013-10-24 16:23:34 -07:00
committed by Android Git Automerger
parent 180e484ef0 fe470c37de
commit 204b1e2817
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/pm/Settings.java
View File

@@ -2070,8 +2070,10 @@ final class Settings {
if (intent.getAction() != null) {
filter.addAction(intent.getAction());
}
for (String cat : intent.getCategories()) {
filter.addCategory(cat);
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) {