Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use blobs expiry time in LeaseInfo if the lease expiry time is 0.

Browse Source 
Fixes: 158199358
Test: manual
Change-Id: If78aca785dd5afb7e3605266e004d9956a1f4ae8
This commit is contained in:
Sudheer Shanka
2020-06-05 00:47:26 -07:00
parent edcb2c38f4
commit f25dd77cbc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
View File

@@ -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(),