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

Commit 227d69ec authored by Mohammad Islam's avatar Mohammad Islam Committed by Automerger Merge Worker
Browse files

Merge "Append root cause with error message while parsing APEX" am: 411f31c8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642324

Change-Id: I20081011e279f31ac84fe657c9d569f6b00db253
parents ead4d8c3 411f31c8

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

+4 −3
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public class StagingManager { 
            newSigningDetails = ApkSignatureVerifier.verify(apexPath, minSignatureScheme);

        } catch (PackageParserException e) {

            throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,

                    "Failed to parse APEX package " + apexPath, e);

                    "Failed to parse APEX package " + apexPath + " : " + e, e);

        }



        // Get signing details of the existing package
@@ -221,7 +221,8 @@ public class StagingManager { 
                existingApexPkg.applicationInfo.sourceDir, SignatureSchemeVersion.JAR);

        } catch (PackageParserException e) {

            throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,

                    "Failed to parse APEX package " + existingApexPkg.applicationInfo.sourceDir, e);

                    "Failed to parse APEX package " + existingApexPkg.applicationInfo.sourceDir

                            + " : " + e, e);

        }



        // Verify signing details for upgrade
@@ -283,7 +284,7 @@ public class StagingManager { 
                }

            } catch (PackageParserException e) {

                throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,

                        "Failed to parse APEX package " + apexInfo.modulePath, e);

                        "Failed to parse APEX package " + apexInfo.modulePath + " : " + e, e);

            }

            final PackageInfo activePackage = mApexManager.getPackageInfo(packageInfo.packageName,

                    ApexManager.MATCH_ACTIVE_PACKAGE);