diff options
| author | 2019-05-02 10:07:04 +0200 | |
|---|---|---|
| committer | 2019-05-02 11:22:55 +0200 | |
| commit | 4780c5f841562c3c60d4cb62d6047265853a6e9e (patch) | |
| tree | a22d038ce7fa70abf3447df36411967376865caf | |
| parent | f5096afd11c1e6789e8781a259767efa32b5ca7a (diff) | |
Move starting filesystem checkpoint out of StagingManager.
And into apexd. Since we don't need filesystem checkpointing for APKs
that are part of a staged install, it makes more sense to do all of
the checkpointing logic in apexd instead.
Bug: 126740531
Test: atest apexservice_test
atest apex_e2e_tests
Change-Id: If832bcfacd976ec173af1b0ffa73f4fdc6632cc4
| -rw-r--r-- | services/core/java/com/android/server/pm/StagingManager.java | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 803ab2d299e2..bb9f6749ba08 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -44,13 +44,11 @@ import android.os.ParcelFileDescriptor; import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; -import android.os.storage.IStorageManager; import android.util.Slog; import android.util.SparseArray; import android.util.apk.ApkSignatureVerifier; import com.android.internal.annotations.GuardedBy; -import com.android.internal.content.PackageHelper; import com.android.internal.os.BackgroundThread; import java.io.File; @@ -255,21 +253,6 @@ public class StagingManager { } } - // Make sure we start a filesystem checkpoint on the next boot. - try { - IStorageManager storageManager = PackageHelper.getStorageManager(); - if (storageManager.supportsCheckpoint()) { - storageManager.startCheckpoint(1 /* numRetries */); - } - } catch (Exception e) { // TODO(b/130190815) make a RemoteException again - // While StorageManager lives in the same process, the native implementation - // it calls through lives in 'vold'; so, this call can fail if 'vold' isn't - // reachable. - // Since we can live without filesystem checkpointing, just warn in this case - // and continue. - Slog.w(TAG, "Could not start filesystem checkpoint:", e); - } - session.setStagedSessionReady(); if (sessionContainsApex(session) && !mApexManager.markStagedSessionReady(session.sessionId)) { |