Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc6acd22 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Restore PackageParser UnsupportedAppUsage 

The UnsupportedAppUsage annotation was accidentally removed in
e6d7a2d0. Restore the method
signature/annotation.

Bug: 150681392
Test: none
Change-Id: I6c46a777c0dbd53fa67d6e1c3e09248f636fe82b
parent cb2d2ec7

core/java/android/content/pm/PackageParser.java

+4 −2
Original line number Diff line number Diff line
@@ -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;