commit 06061416fd0a9d79b60c0f7ed7653d293f87195b
author Sudheer Shanka <sudheersai@google.com> Wed Feb 19 18:31:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 19 18:31:26 2020 +0000
tree 198ff483822d4574e46d96e4423dddeb10418d63
parent 4090e95ba6ed8ff8a054eeedd0f4e58e06ade52c
parent 51a6c6ee50c7144abb5aab4930eb4ae3887b47d9

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

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

diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
index d4ceabd..7b3764a 100644
--- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
+++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
@@ -334,7 +334,8 @@
                 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");
             }