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

Commit 7c30ab8c authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

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

parents 8ef4c5ba f25dd77c

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

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