Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove restriction on new installs before previous is done." into sc-dev

Browse Source
This commit is contained in:
Alex Buynytskyy
2021-03-11 07:01:57 +00:00
committed by Android (Google) Code Review
parent af8edd8ec5 8806599460
commit 17ff0d81a6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/incremental/IncrementalFileStorages.java
View File

@@ -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.");
}