From 1030f5807e6b4fb593a675fb3f91e77bbadc5b94 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Mon, 9 Aug 2021 12:12:26 +0800 Subject: [PATCH] Remove the usage of PackageParser PackageParser.PackageParserException is deparected, and should be either using the PraseResult or throwing a more generic Exception. Remove the unused setError method. Besides, using alternative instead of PackageParser when checking AndroidTestBaseUpdater. Bug: 174723245 Test: build Test: atest PackageBackwardCompatibilityTest Test: atest AndroidTestRunnerSplitUpdaterTest Change-Id: I572d167ae3d794ef9f11e7564f09694d0f906f0c --- .../com/android/internal/content/NativeLibraryHelper.java | 3 +-- .../java/com/android/server/pm/PackageInstalledInfo.java | 7 ------- .../pm/parsing/library/PackageBackwardCompatibility.java | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java index 10750b695a396..0c56c677e06f9 100644 --- a/core/java/com/android/internal/content/NativeLibraryHelper.java +++ b/core/java/com/android/internal/content/NativeLibraryHelper.java @@ -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 = "-"; /** diff --git a/services/core/java/com/android/server/pm/PackageInstalledInfo.java b/services/core/java/com/android/server/pm/PackageInstalledInfo.java index afe6bb2cc792d..d0ca9d845560e 100644 --- a/services/core/java/com/android/server/pm/PackageInstalledInfo.java +++ b/services/core/java/com/android/server/pm/PackageInstalledInfo.java @@ -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)); diff --git a/services/core/java/com/android/server/pm/parsing/library/PackageBackwardCompatibility.java b/services/core/java/com/android/server/pm/parsing/library/PackageBackwardCompatibility.java index 8a8a302734b10..4334bf6d32f29 100644 --- a/services/core/java/com/android/server/pm/parsing/library/PackageBackwardCompatibility.java +++ b/services/core/java/com/android/server/pm/parsing/library/PackageBackwardCompatibility.java @@ -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) {