summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ryan Mitchell <rtmitchell@google.com> 2020-03-03 08:59:53 -0800
committer Ryan Mitchell <rtmitchell@google.com> 2020-03-03 08:59:53 -0800
commitcc6acd2268d7bfec40c0c4f01c72cb1119267c32 (patch)
treeb40ac4c32a891183826a85fba9f4b1cfc41026ed
parentcb2d2ec786140c9ff001868308d5ffb1c0456d2a (diff)
Restore PackageParser UnsupportedAppUsage
The UnsupportedAppUsage annotation was accidentally removed in e6d7a2d022ed95361bcc02337fa7a5754810ecd0. Restore the method signature/annotation. Bug: 150681392 Test: none Change-Id: I6c46a777c0dbd53fa67d6e1c3e09248f636fe82b
-rw-r--r--core/java/android/content/pm/PackageParser.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 1de8245088da..64f73cf1a56c 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -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;