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

Merge "Remove the usage of PackageParser"

Browse Source
This commit is contained in:
Jackal Guo
2021-08-13 06:53:18 +00:00
committed by Android (Google) Code Review
parent 92289bf4e0 1030f5807e
commit 42c12fa3d2
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/content/NativeLibraryHelper.java
View File

@@ -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 = "-";
/**

7
services/core/java/com/android/server/pm/PackageInstalledInfo.java
View File

@@ -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));

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

@@ -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) {