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

Commit 7fae0273 authored by Michael Groover's avatar Michael Groover Committed by Automerger Merge Worker
Browse files

Merge "Create new instance of shared lineage signers to preserve capabilities"... 

Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev am: 71f64ff1 am: a13fd1a4

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

Change-Id: I66473d41936b889bdf62b821ede898bf58b26668
parents 7086456d a13fd1a4

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

+10 −1
Original line number Diff line number Diff line
@@ -174,7 +174,16 @@ class PackageSignatures { 
                                if (index >= 0 && index < readSignatures.size()) {

                                    Signature sig = readSignatures.get(index);

                                    if (sig != null) {

                                        // An app using a shared signature in its signing lineage

                                        // can have unique capabilities assigned to this previous

                                        // signer; create a new instance of this Signature to ensure

                                        // its flags do not overwrite those of the instance from

                                        // readSignatures.

                                        if (isPastSigs) {

                                            signatures.add(new Signature(sig));

                                        } else {

                                            signatures.add(sig);

                                        }

                                        signatureParsed = true;

                                    } else {

                                        PackageManagerService.reportSettingsProblem(Log.WARN,