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

Commit c0b18d11 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I34f54b7c72417c486d180c371301d42ec48e1510
parents c88c0464 7c30ab8c

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -478,7 +478,9 @@ public class BlobStoreManagerService extends SystemService { 
                            ? Resources.ID_NULL

                            ? Resources.ID_NULL

                            : getDescriptionResourceId(resourcesGetter.apply(leasee.packageName),

                            : getDescriptionResourceId(resourcesGetter.apply(leasee.packageName),

                                    leasee.descriptionResEntryName, 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));

                            descriptionResId, leasee.description));

                });

                });

                blobInfos.add(new BlobInfo(blobMetadata.getBlobId(),

                blobInfos.add(new BlobInfo(blobMetadata.getBlobId(),