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 am: 2535cd4ec9

Browse Source 
Change-Id: I0fe6d7a202fb86d48b7b7a935266a0b2d3cc6b4b
This commit is contained in:
Automerger Merge Worker
2020-03-04 18:25:19 +00:00
parent d17e6a529b 2535cd4ec9
commit ab6eb01a1e
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 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) {
throw new PackageParserException(mParseError,
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
* packages.
*
* @param apkPath The package apk file path
* @param res The resources from which to resolve values
* @param parser The manifest parser
* @param flags Flags how to parse
@@ -1794,7 +1795,8 @@ public class PackageParser {
* @throws XmlPullParserException
* @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 {
final String splitName;
final String pkgName;