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

Merge "Implement system data migration support."

Browse Source
This commit is contained in:
Dianne Hackborn
2010-02-03 18:18:56 -08:00
committed by Android (Google) Code Review
parent b039fd4c4a b858dfda50
commit fa6bc84e01
7 changed files with 556 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/android/content/pm/PackageParser.java
View File

@@ -953,6 +953,39 @@ public class PackageParser {
return null;
}
} else if (tagName.equals("original-package")) {
sa = res.obtainAttributes(attrs,
com.android.internal.R.styleable.AndroidManifestOriginalPackage);
String name = sa.getNonResourceString(
com.android.internal.R.styleable.AndroidManifestOriginalPackage_name);
sa.recycle();
if (name != null && (flags&PARSE_IS_SYSTEM) != 0) {
pkg.mOriginalPackage = name;
}
XmlUtils.skipCurrentTag(parser);
} else if (tagName.equals("adopt-permissions")) {
sa = res.obtainAttributes(attrs,
com.android.internal.R.styleable.AndroidManifestOriginalPackage);
String name = sa.getNonResourceString(
com.android.internal.R.styleable.AndroidManifestOriginalPackage_name);
sa.recycle();
if (name != null && (flags&PARSE_IS_SYSTEM) != 0) {
if (pkg.mAdoptPermissions == null) {
pkg.mAdoptPermissions = new ArrayList<String>();
}
pkg.mAdoptPermissions.add(name);
}
XmlUtils.skipCurrentTag(parser);
} else if (tagName.equals("eat-comment")) {
// Just skip this tag
XmlUtils.skipCurrentTag(parser);
@@ -2528,6 +2561,9 @@ public class PackageParser {
public ArrayList<String> usesOptionalLibraries = null;
public String[] usesLibraryFiles = null;
public String mOriginalPackage = null;
public ArrayList<String> mAdoptPermissions = null;
// We store the application meta-data independently to avoid multiple unwanted references
public Bundle mAppMetaData = null;