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

Commit 6a051228 authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam
Browse files

Append root cause with error message while parsing APEX 

Bug: 182409819
Test: manual
Change-Id: I30b1376f4d4738487e21a263f217777dc89949c4
parent 643fb23a

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