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

Merge "Use blobs expiry time in LeaseInfo if the lease expiry time is 0." into rvc-dev am: 7c30ab8c50

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744167

Change-Id: I6b951b9f0b479b68ba3f600141b4603d2fb61c95
This commit is contained in:
Sudheer Shanka
2020-06-10 06:51:40 +00:00
committed by Automerger Merge Worker
parent 00ef791466 7c30ab8c50
commit 39119a25e3
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

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