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

Commit 8af3add9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Append root cause with error message while parsing APEX" am: 411f31c8 am: 227d69ec am: 4825a02c" into sc-dev am: de4d7421

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

Change-Id: I2a819c25688528118bc3c1000220a8ea389086fb
parents 0a3f194e de4d7421

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

+4 −3
Original line number Diff line number Diff line
@@ -214,7 +214,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
@@ -232,7 +232,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
@@ -291,7 +292,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);