From 29762c3dfb7a510c23f021f6797840ebd80663af Mon Sep 17 00:00:00 2001 From: Nicolas Prevot Date: Tue, 29 Jul 2014 18:51:32 +0100 Subject: [PATCH] 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 --- .../com/android/server/pm/CrossProfileIntentFilter.java | 5 +++-- services/core/java/com/android/server/pm/Settings.java | 9 ++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/pm/CrossProfileIntentFilter.java b/services/core/java/com/android/server/pm/CrossProfileIntentFilter.java index c61d344f48e68..203d99025968d 100644 --- a/services/core/java/com/android/server/pm/CrossProfileIntentFilter.java +++ b/services/core/java/com/android/server/pm/CrossProfileIntentFilter.java @@ -88,8 +88,9 @@ class CrossProfileIntentFilter extends IntentFilter { if (tagName.equals(ATTR_FILTER)) { break; } else { - String msg = "Unknown element under " + Settings.TAG_FORWARDING_INTENT_FILTERS - + ": " + tagName + " at " + parser.getPositionDescription(); + String msg = "Unknown element under " + + Settings.TAG_CROSS_PROFILE_INTENT_FILTERS + ": " + tagName + " at " + + parser.getPositionDescription(); PackageManagerService.reportSettingsProblem(Log.WARN, msg); XmlUtils.skipCurrentTag(parser); } diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index d1ea3e19e9d6b..cd2aa2247f62d 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -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_TAG_PACKAGE_NAME = "package-name"; 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_USER = "user"; @@ -1277,8 +1274,7 @@ final class Settings { readPreferredActivitiesLPw(parser, userId); } else if (tagName.equals(TAG_PERSISTENT_PREFERRED_ACTIVITIES)) { readPersistentPreferredActivitiesLPw(parser, userId); - } else if (tagName.equals(TAG_FORWARDING_INTENT_FILTERS) - || tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) { + } else if (tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) { readCrossProfileIntentFiltersLPw(parser, userId); } else if (tagName.equals(TAG_CROSS_PROFILE_PACKAGE_INFO)){ readCrossProfilePackageInfoLPw(parser, userId); @@ -2154,8 +2150,7 @@ final class Settings { // TODO: check whether this is okay! as it is very // similar to how preferred-activities are treated readPersistentPreferredActivitiesLPw(parser, 0); - } else if (tagName.equals(TAG_FORWARDING_INTENT_FILTERS) - || tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) { + } else if (tagName.equals(TAG_CROSS_PROFILE_INTENT_FILTERS)) { // TODO: check whether this is okay! as it is very // similar to how preferred-activities are treated readCrossProfileIntentFiltersLPw(parser, 0);