diff options
| author | 2019-07-19 10:25:41 -0700 | |
|---|---|---|
| committer | 2019-07-19 10:25:41 -0700 | |
| commit | fb544108749ec35a2efc331fb57e15ebc0b11035 (patch) | |
| tree | 9479c08f634a541fb7928e7463cf6afd9bcc986c | |
| parent | 4190144c27897762457d4f112fff0dfa3e5845ff (diff) | |
| parent | 3f124d64636d379e18290db9de0aef69ce1b38ba (diff) | |
Merge "Postpone the shared user checking after Q" into qt-dev
am: 3f124d6463
Change-Id: Id2d44a418a58eb3b1456d81f03fe2f8fe28685e2
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 24a0c885223b..960cce49e342 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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: " |