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

Commit 29762c3d authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Nicolas Prévot
Browse files

Removing old tag TAG_FORWARDING_INTENT_FILTERS. 

By now, all devices should have updated, so we can remove the
old tag name.

Change-Id: Id0bc0e08f3979c5a2652c4eb8da9ff938b5d5bc4
parent 4d4920ad

services/core/java/com/android/server/pm/CrossProfileIntentFilter.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -88,8 +88,9 @@ class CrossProfileIntentFilter extends IntentFilter { 
                if (tagName.equals(ATTR_FILTER)) {

                if (tagName.equals(ATTR_FILTER)) {

                    break;

                    break;

                } else {

                } else {

                    String msg = "Unknown element under " + Settings.TAG_FORWARDING_INTENT_FILTERS

                    String msg = "Unknown element under "

                            + ": " + tagName + " at " + parser.getPositionDescription();

                            + Settings.TAG_CROSS_PROFILE_INTENT_FILTERS + ": " + tagName + " at "

                            + parser.getPositionDescription();

                    PackageManagerService.reportSettingsProblem(Log.WARN, msg);

                    PackageManagerService.reportSettingsProblem(Log.WARN, msg);

                    XmlUtils.skipCurrentTag(parser);

                    XmlUtils.skipCurrentTag(parser);

                }

                }

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -142,9 +142,6 @@ final class Settings { 
    private static final String CROSS_PROFILE_PACKAGE_INFO_ATTR_TARGET_USER_ID = "target-user-id";

    private static final String CROSS_PROFILE_PACKAGE_INFO_ATTR_TARGET_USER_ID = "target-user-id";

    private static final String CROSS_PROFILE_PACKAGE_INFO_TAG_PACKAGE_NAME = "package-name";

    private static final String CROSS_PROFILE_PACKAGE_INFO_TAG_PACKAGE_NAME = "package-name";

    private static final String CROSS_PROFILE_PACKAGE_INFO_ATTR_PACKAGE_NAME = "value";

    private static final String CROSS_PROFILE_PACKAGE_INFO_ATTR_PACKAGE_NAME = "value";

    //Old name. Kept for compatibility

    static final String TAG_FORWARDING_INTENT_FILTERS =

            "forwarding-intent-filters";





    private static final String ATTR_NAME = "name";

    private static final String ATTR_NAME = "name";

    private static final String ATTR_USER = "user";

    private static final String ATTR_USER = "user";
@@ -1277,8 +1274,7 @@ final class Settings { 
                    readPreferredActivitiesLPw(parser, userId);

                    readPreferredActivitiesLPw(parser, userId);

                } else if (tagName.equals(TAG_PERSISTENT_PREFERRED_ACTIVITIES)) {

                } else if (tagName.equals(TAG_PERSISTENT_PREFERRED_ACTIVITIES)) {

                    readPersistentPreferredActivitiesLPw(parser, userId);

                    readPersistentPreferredActivitiesLPw(parser, userId);

                } else if (tagName.equals(TAG_FORWARDING_INTENT_FILTERS)

                } else if (tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) {

                        || tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) {

                    readCrossProfileIntentFiltersLPw(parser, userId);

                    readCrossProfileIntentFiltersLPw(parser, userId);

                } else if (tagName.equals(TAG_CROSS_PROFILE_PACKAGE_INFO)){

                } else if (tagName.equals(TAG_CROSS_PROFILE_PACKAGE_INFO)){

                    readCrossProfilePackageInfoLPw(parser, userId);

                    readCrossProfilePackageInfoLPw(parser, userId);
@@ -2154,8 +2150,7 @@ final class Settings { 
                    // TODO: check whether this is okay! as it is very

                    // TODO: check whether this is okay! as it is very

                    // similar to how preferred-activities are treated

                    // similar to how preferred-activities are treated

                    readPersistentPreferredActivitiesLPw(parser, 0);

                    readPersistentPreferredActivitiesLPw(parser, 0);

                } else if (tagName.equals(TAG_FORWARDING_INTENT_FILTERS)

                } else if (tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) {

                        || tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) {

                    // TODO: check whether this is okay! as it is very

                    // TODO: check whether this is okay! as it is very

                    // similar to how preferred-activities are treated

                    // similar to how preferred-activities are treated

                    readCrossProfileIntentFiltersLPw(parser, 0);

                    readCrossProfileIntentFiltersLPw(parser, 0);