Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9e31f89 authored by Erin Dahlgren's avatar Erin Dahlgren Committed by Android Git Automerger
Browse files

am b9705893: am 204b1e28: am fe470c37: Merge "Have the package manager write... 

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

* commit 'b9705893':
  Have the package manager write mimetype of preferred activities to xml.
parents 9748fe9a b9705893

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

+11 −2
Original line number Original line Diff line number Diff line
@@ -2070,9 +2070,11 @@ final class Settings { 
                if (intent.getAction() != null) {

                if (intent.getAction() != null) {

                    filter.addAction(intent.getAction());

                    filter.addAction(intent.getAction());

                }

                }

                if (intent.getCategories() != null) {

                    for (String cat : intent.getCategories()) {

                    for (String cat : intent.getCategories()) {

                        filter.addCategory(cat);

                        filter.addCategory(cat);

                    }

                    }

                }

                if ((flags&PackageManager.MATCH_DEFAULT_ONLY) != 0) {

                if ((flags&PackageManager.MATCH_DEFAULT_ONLY) != 0) {

                    filter.addCategory(Intent.CATEGORY_DEFAULT);

                    filter.addCategory(Intent.CATEGORY_DEFAULT);

                }

                }
@@ -2088,6 +2090,13 @@ final class Settings { 
                if (path != null) {

                if (path != null) {

                    filter.addDataPath(path);

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

                PreferredActivity pa = new PreferredActivity(filter, match, set, cn, true);

                editPreferredActivitiesLPw(userId).addFilter(pa);

                editPreferredActivitiesLPw(userId).addFilter(pa);

            } else if (!haveNonSys) {

            } else if (!haveNonSys) {