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

Commit 27414445 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... 

Merge "Append root cause with error message while parsing APEX" am: 411f31c8 am: 227d69ec am: 4825a02c

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

Change-Id: Ie2e7e96cd6afa49f16a9556bf43650208911a54a
parents 78af4257 4825a02c

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

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

            newSigningDetails = ApkSignatureVerifier.verify(apexPath, minSignatureScheme);

        } catch (PackageParserException e) {

        } catch (PackageParserException e) {

            throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,

            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

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

                existingApexPkg.applicationInfo.sourceDir, SignatureSchemeVersion.JAR);

        } catch (PackageParserException e) {

        } catch (PackageParserException e) {

            throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,

            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

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

                }

            } catch (PackageParserException e) {

            } catch (PackageParserException e) {

                throw new PackageManagerException(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,

                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,

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

                    ApexManager.MATCH_ACTIVE_PACKAGE);

                    ApexManager.MATCH_ACTIVE_PACKAGE);