diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2020-06-10 06:43:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-10 06:43:41 +0000 |
| commit | 7c30ab8c50d2c8df2e39d2d9728cfdccbc1f9d22 (patch) | |
| tree | 2aa517a53af6448dced40c3b310cbbb9c1cea0fd /apex/blobstore | |
| parent | 8ef4c5bac065a3392faf9e5bc1d908ec6987efbe (diff) | |
| parent | f25dd77cbc1e617b291bcf6604fda099b18cebe3 (diff) | |
Merge "Use blobs expiry time in LeaseInfo if the lease expiry time is 0." into rvc-dev
Diffstat (limited to 'apex/blobstore')
| -rw-r--r-- | apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java index 0a5ada282388..6e33ad9b7794 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java @@ -478,7 +478,9 @@ public class BlobStoreManagerService extends SystemService { ? Resources.ID_NULL : getDescriptionResourceId(resourcesGetter.apply(leasee.packageName), leasee.descriptionResEntryName, leasee.packageName); - leaseInfos.add(new LeaseInfo(leasee.packageName, leasee.expiryTimeMillis, + final long expiryTimeMs = leasee.expiryTimeMillis == 0 + ? blobHandle.getExpiryTimeMillis() : leasee.expiryTimeMillis; + leaseInfos.add(new LeaseInfo(leasee.packageName, expiryTimeMs, descriptionResId, leasee.description)); }); blobInfos.add(new BlobInfo(blobMetadata.getBlobId(), |