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

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

Merge "Allow lease expiry to be +ve when the corresponding blobs expiry is 0."

parents 4090e95b 51a6c6ee

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

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ public class BlobStoreManagerService extends SystemService { 
                throw new SecurityException("Caller not allowed to access " + blobHandle

                        + "; callingUid=" + callingUid + ", callingPackage=" + callingPackage);

            }

            if (leaseExpiryTimeMillis != 0 && leaseExpiryTimeMillis > blobHandle.expiryTimeMillis) {

            if (leaseExpiryTimeMillis != 0 && blobHandle.expiryTimeMillis != 0

                    && leaseExpiryTimeMillis > blobHandle.expiryTimeMillis) {

                throw new IllegalArgumentException(

                        "Lease expiry cannot be later than blobs expiry time");

            }