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

Commit 8100a2d9 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Merge "Postpone the shared user checking after Q" into qt-dev am:... 

Merge "Merge "Postpone the shared user checking after Q" into qt-dev am: 3f124d64 am: ceaa7d45" into qt-r1-dev-plus-aosp
am: 38125a18

Change-Id: I46d0a45c0c9defda60a966233a7a35932891a93a
parents d14344c1 38125a18

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

+5 −5
Original line number Diff line number Diff line
@@ -15918,13 +15918,13 @@ public class PackageManagerService extends IPackageManager.Stub 
                                && compareSignatures(sharedUserSignatures,

                                        pkg.mSigningDetails.signatures)

                                        != PackageManager.SIGNATURE_MATCH) {

                            if (SystemProperties.getInt("ro.product.first_api_level", 0) <= 28) {

                            if (SystemProperties.getInt("ro.product.first_api_level", 0) <= 29) {

                                // Mismatched signatures is an error and silently skipping system

                                // packages will likely break the device in unforeseen ways.

                                // However,

                                // we allow the device to boot anyway because, prior to P,

                                // vendors were

                                // not expecting the platform to crash in this situation.

                                // However, we allow the device to boot anyway because, prior to Q,

                                // vendors were not expecting the platform to crash in this

                                // situation.

                                // This WILL be a hard failure on any new API levels after Q.

                                throw new ReconcileFailure(

                                        INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES,

                                        "Signature mismatch for shared user: "