Merge "Merge "Postpone the shared user checking after Q" into qt-dev am: 3f124d6463 am: ceaa7d45d2" into qt-r1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2019-07-19 17:35:40 +00:00
committed by Android (Google) Code Review

View File

@@ -16591,13 +16591,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: "