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

Removing old tag TAG_FORWARDING_INTENT_FILTERS.

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

Change-Id: Id0bc0e08f3979c5a2652c4eb8da9ff938b5d5bc4
This commit is contained in:
Nicolas Prevot
2014-07-29 18:51:32 +01:00
committed by Nicolas Prévot
parent 4d4920ad81
commit 29762c3dfb
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/CrossProfileIntentFilter.java
View File

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

9
services/core/java/com/android/server/pm/Settings.java
View File

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