[automerge] Disable persistent bookkeeping if dedupDownloadWithEtag is false. 2p: 75f888c634

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobile-data-download/+/19753984

Bug: 243926815
Change-Id: I7b8912abf78ca77ffc62287de6ac262a43c98c79

1 files changed, 14 insertions, 0 deletions

diff --git a/java/com/google/android/libraries/mobiledatadownload/populator/ManifestFileGroupPopulator.java b/java/com/google/android/libraries/mobiledatadownload/populator/ManifestFileGroupPopulator.java
index 66d26ab..422470e 100644
--- a/java/com/google/android/libraries/mobiledatadownload/populator/ManifestFileGroupPopulator.java
+++ b/java/com/google/android/libraries/mobiledatadownload/populator/ManifestFileGroupPopulator.java
@@ -481,6 +481,16 @@ public final class ManifestFileGroupPopulator implements FileGroupPopulator {
     LogUtil.d("%s: Prepare for downloading manifest file.", TAG);
 
     if (!dedupDownloadWithEtag) {
+      LogUtil.d(
+              "%s: Not relying on etag to dedup manifest -- forcing re-download; urlToDownload = %s;"
+                      + " manifestFileUri = %s",
+              TAG, urlToDownload, manifestFileUri);
+      try {
+        deleteManifestFileChecked(manifestFileUri);
+      } catch (DownloadException e) {
+        return immediateFailedFuture(e);
+      }
+      bookkeepingRef.set(createDefaultManifestFileBookkeeping(urlToDownload));
       return immediateVoidFuture();
     }
 
@@ -531,6 +541,10 @@ public final class ManifestFileGroupPopulator implements FileGroupPopulator {
     LogUtil.d("%s: Finalize for downloading manifest file.", TAG);
 
     if (!dedupDownloadWithEtag) {
+      LogUtil.d(
+              "%s: Not relying on etag to dedup manifest, so the downloaded manifest is"
+                      + " assumed to be the latest; urlToDownload = %s, manifestFileUri = %s",
+              TAG, urlToDownload, manifestFileUri);
       return immediateVoidFuture();
     }