diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2020-06-05 00:47:26 -0700 |
|---|---|---|
| committer | Sudheer Shanka <sudheersai@google.com> | 2020-06-05 00:47:26 -0700 |
| commit | f25dd77cbc1e617b291bcf6604fda099b18cebe3 (patch) | |
| tree | 0e9fdd079e6c3aecdc1ce328175a91553cfb397f /apex/blobstore/service | |
| parent | edcb2c38f4a06fbc4fe786e3a5f441d0ef69b55c (diff) | |
Use blobs expiry time in LeaseInfo if the lease expiry time is 0.
Fixes: 158199358
Test: manual
Change-Id: If78aca785dd5afb7e3605266e004d9956a1f4ae8
Diffstat (limited to 'apex/blobstore/service')
| -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 a2bce31fc7b2..850feadaa226 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java @@ -479,7 +479,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(), |