Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f25dd77c authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

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

Fixes: 158199358
Test: manual
Change-Id: If78aca785dd5afb7e3605266e004d9956a1f4ae8
parent edcb2c38

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -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(),