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

Commit 42c12fa3 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Remove the usage of PackageParser"

parents 92289bf4 1030f580

core/java/com/android/internal/content/NativeLibraryHelper.java

+1 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ public class NativeLibraryHelper { 
    public static final String LIB_DIR_NAME = "lib";

    public static final String LIB64_DIR_NAME = "lib64";



    // Special value for {@code PackageParser.Package#cpuAbiOverride} to indicate

    // that the cpuAbiOverride must be clear.

    // Special value for indicating that the cpuAbiOverride must be clear.

    public static final String CLEAR_ABI_OVERRIDE = "-";



    /**

services/core/java/com/android/server/pm/PackageInstalledInfo.java

+0 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.pm; 


import static com.android.server.pm.PackageManagerService.TAG;



import android.content.pm.PackageParser;

import android.util.ExceptionUtils;

import android.util.Slog;
@@ -59,12 +58,6 @@ final class PackageInstalledInfo { 
        Slog.w(TAG, msg);

    }



    public void setError(String msg, PackageParser.PackageParserException e) {

        setReturnCode(e.error);

        setReturnMessage(ExceptionUtils.getCompleteMessage(msg, e));

        Slog.w(TAG, msg, e);

    }



    public void setError(String msg, PackageManagerException e) {

        mReturnCode = e.error;

        setReturnMessage(ExceptionUtils.getCompleteMessage(msg, e));

services/core/java/com/android/server/pm/parsing/library/PackageBackwardCompatibility.java

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import static com.android.server.pm.parsing.library.SharedLibraryNames.ANDROID_T 
import static com.android.server.pm.parsing.library.SharedLibraryNames.ANDROID_TEST_RUNNER;

import static com.android.server.pm.parsing.library.SharedLibraryNames.ORG_APACHE_HTTP_LEGACY;



import android.content.pm.PackageParser;

import android.content.pm.parsing.ParsingPackage;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;
@@ -82,7 +82,7 @@ public class PackageBackwardCompatibility extends PackageSharedLibraryUpdater { 
        boolean hasClass = false;

        String className = "android.content.pm.AndroidTestBaseUpdater";

        try {

            Class clazz = (PackageParser.class.getClassLoader().loadClass(className));

            Class clazz = ParsingPackage.class.getClassLoader().loadClass(className);

            hasClass = clazz != null;

            Log.i(TAG, "Loaded " + className);

        } catch (ClassNotFoundException e) {