From 52655fe0113f652ff7e3c2467748d53ca2c2a9dd Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Tue, 2 Mar 2021 02:40:50 +0000
Subject: [PATCH] [pm] return original error message for abi install failures

BUG: 179724723
Test: manual, using test apk from b/179072387
Change-Id: I795f6af05b1ed2c353d187d3a47ee8cb1ee5e0b6
---
 .../core/java/com/android/server/pm/PackageManagerService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index e3f925a97ddaa..96da8071b9a64 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -20090,7 +20090,7 @@ public class PackageManagerService extends IPackageManager.Stub
             } catch (PackageManagerException pme) {
                 Slog.e(TAG, "Error deriving application ABI", pme);
                 throw new PrepareFailure(INSTALL_FAILED_INTERNAL_ERROR,
-                        "Error deriving application ABI");
+                        "Error deriving application ABI: " + pme.getMessage());
             }
         }