diff options
| author | Alex Buynytskyy <alexbuy@google.com> | 2021-03-09 17:00:43 -0800 |
|---|---|---|
| committer | Alex Buynytskyy <alexbuy@google.com> | 2021-03-10 16:37:32 +0000 |
| commit | 8806599460f7e3ae359260445c6b427e85dee189 (patch) | |
| tree | e3000ccddf24f383e6f1ba5288abc760edb7e611 /core/java/android | |
| parent | fd857e37d352b2275e192e5cc96a3bc41552eb06 (diff) | |
Remove restriction on new installs before previous is done.
Bug: 160634487
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I1ef1ab39903976bbf4679d148a0ab844402c334e
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/incremental/IncrementalFileStorages.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/os/incremental/IncrementalFileStorages.java b/core/java/android/os/incremental/IncrementalFileStorages.java index 73520e07d118..2a42b981ac26 100644 --- a/core/java/android/os/incremental/IncrementalFileStorages.java +++ b/core/java/android/os/incremental/IncrementalFileStorages.java @@ -51,6 +51,8 @@ import java.util.UUID; public final class IncrementalFileStorages { private static final String TAG = "IncrementalFileStorages"; + private static final String SYSTEM_DATA_LOADER_PACKAGE = "android"; + private @NonNull final IncrementalManager mIncrementalManager; private @NonNull final File mStageDir; private @Nullable IncrementalStorage mInheritedStorage; @@ -116,7 +118,10 @@ public final class IncrementalFileStorages { mInheritedStorage = mIncrementalManager.openStorage( inheritedDir.getAbsolutePath()); if (mInheritedStorage != null) { - if (!mInheritedStorage.isFullyLoaded()) { + boolean systemDataLoader = SYSTEM_DATA_LOADER_PACKAGE.equals( + dataLoaderParams.getComponentName().getPackageName()); + if (systemDataLoader && !mInheritedStorage.isFullyLoaded()) { + // System data loader does not support incomplete storages. throw new IOException("Inherited storage has missing pages."); } |