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

Merge "Restore PackageParser UnsupportedAppUsage" into rvc-dev am: 1c275d93d2

Browse Source 
Change-Id: Ibd5421645914fb39778e5d0bfec2d8119f6cf04a
This commit is contained in:
Automerger Merge Worker
2020-03-04 18:05:26 +00:00
parent 5153bf7457 1c275d93d2
commit 2535cd4ec9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1189,7 +1189,7 @@ public class PackageParser {
final Resources res = new Resources(assets, mMetrics, null); final Resources res = new Resources(assets, mMetrics, null);
final String[] outError = new String[1]; final String[] outError = new String[1];
final Package pkg = parseBaseApk(res, parser, flags, outError); final Package pkg = parseBaseApk(apkPath, res, parser, flags, outError);
if (pkg == null) { if (pkg == null) {
throw new PackageParserException(mParseError, throw new PackageParserException(mParseError,
apkPath + " (at " + parser.getPositionDescription() + "): " + outError[0]); apkPath + " (at " + parser.getPositionDescription() + "): " + outError[0]);
@@ -1785,6 +1785,7 @@ public class PackageParser {
* need to consider whether they should be supported by split APKs and child * need to consider whether they should be supported by split APKs and child
* packages. * packages.
* *
* @param apkPath The package apk file path
* @param res The resources from which to resolve values * @param res The resources from which to resolve values
* @param parser The manifest parser * @param parser The manifest parser
* @param flags Flags how to parse * @param flags Flags how to parse
@@ -1794,7 +1795,8 @@ public class PackageParser {
* @throws XmlPullParserException * @throws XmlPullParserException
* @throws IOException * @throws IOException
*/ */
private Package parseBaseApk(Resources res, XmlResourceParser parser, int flags, @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
private Package parseBaseApk(String apkPath, Resources res, XmlResourceParser parser, int flags,
String[] outError) throws XmlPullParserException, IOException { String[] outError) throws XmlPullParserException, IOException {
final String splitName; final String splitName;
final String pkgName; final String pkgName;