From f25dd77cbc1e617b291bcf6604fda099b18cebe3 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Fri, 5 Jun 2020 00:47:26 -0700 Subject: Use blobs expiry time in LeaseInfo if the lease expiry time is 0. Fixes: 158199358 Test: manual Change-Id: If78aca785dd5afb7e3605266e004d9956a1f4ae8 --- .../service/java/com/android/server/blob/BlobStoreManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apex/blobstore') 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(), -- cgit v1.2.3-59-g8ed1b