diff options
author | Hao Liu <haoliuu@google.com> | 2023-10-19 20:47:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-10-19 20:47:28 +0000 |
commit | 078fa319688234bae7a2a3c9e93a8dc3313a368c (patch) | |
tree | 13d75c28671b782c922edd061e3d6842657126f0 /java/com/google/android/libraries/mobiledatadownload/internal/MobileDataDownloadManager.java | |
parent | dae4e9d43309e08670dcbca39374d84fd5d2ec9b (diff) | |
parent | bc7ec3ff9db70e8a11310d548541d75c75acbce7 (diff) | |
download | mobile-data-download-078fa319688234bae7a2a3c9e93a8dc3313a368c.tar.gz |
Merge "Code dump with latest updates." into udc-mainline-prod
Diffstat (limited to 'java/com/google/android/libraries/mobiledatadownload/internal/MobileDataDownloadManager.java')
-rw-r--r-- | java/com/google/android/libraries/mobiledatadownload/internal/MobileDataDownloadManager.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/com/google/android/libraries/mobiledatadownload/internal/MobileDataDownloadManager.java b/java/com/google/android/libraries/mobiledatadownload/internal/MobileDataDownloadManager.java index b9496e2..002b896 100644 --- a/java/com/google/android/libraries/mobiledatadownload/internal/MobileDataDownloadManager.java +++ b/java/com/google/android/libraries/mobiledatadownload/internal/MobileDataDownloadManager.java @@ -53,13 +53,13 @@ import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.ListenableFuture; import com.google.errorprone.annotations.CheckReturnValue; +import com.google.mobiledatadownload.LogEnumsProto.MddClientEvent; +import com.google.mobiledatadownload.TransformProto.Transforms; import com.google.mobiledatadownload.internal.MetadataProto.DataFile; import com.google.mobiledatadownload.internal.MetadataProto.DataFile.ChecksumType; import com.google.mobiledatadownload.internal.MetadataProto.DataFileGroupInternal; import com.google.mobiledatadownload.internal.MetadataProto.DownloadConditions; import com.google.mobiledatadownload.internal.MetadataProto.GroupKey; -import com.google.mobiledatadownload.LogEnumsProto.MddClientEvent; -import com.google.mobiledatadownload.TransformProto.Transforms; import com.google.protobuf.Any; import java.io.IOException; import java.io.PrintWriter; @@ -337,7 +337,7 @@ public class MobileDataDownloadManager { // downloaded, pendingGroup must be non-null. DataFileGroupInternal group = checkNotNull(getDone(pendingGroupFuture)); eventLogger.logEventSampled( - MddClientEvent.Code.EVENT_CODE_UNSPECIFIED, + MddClientEvent.Code.DATA_DOWNLOAD_COMPLETE_IMMEDIATE, group.getGroupName(), group.getFileGroupVersionNumber(), group.getBuildId(), @@ -439,7 +439,7 @@ public class MobileDataDownloadManager { if (useIsolatedStructure) { isolatedUriMapBuilder.putAll(fileGroupManager.getIsolatedFileUris(dataFileGroup)); } - ImmutableMap<DataFile, Uri> isolatedUriMap = isolatedUriMapBuilder.build(); + ImmutableMap<DataFile, Uri> isolatedUriMap = isolatedUriMapBuilder.buildKeepingLast(); return PropagatedFluentFuture.from(init()) .transformAsync( @@ -491,7 +491,7 @@ public class MobileDataDownloadManager { finalUriMapBuilder.put(entry); } } - return finalUriMapBuilder.build(); + return finalUriMapBuilder.buildKeepingLast(); }, sequentialControlExecutor); } |