Merge "Update BlobStoreManager javadoc."
diff --git a/apex/blobstore/framework/java/android/app/blob/BlobHandle.java b/apex/blobstore/framework/java/android/app/blob/BlobHandle.java
index d339afa..9c3bd81 100644
--- a/apex/blobstore/framework/java/android/app/blob/BlobHandle.java
+++ b/apex/blobstore/framework/java/android/app/blob/BlobHandle.java
@@ -129,7 +129,8 @@
* @param label a label indicating what the blob is, that can be surfaced to the user.
* @param expiryTimeMillis the time in secs after which the blob should be invalidated and not
* allowed to be accessed by any other app,
- * in {@link System#currentTimeMillis()} timebase.
+ * in {@link System#currentTimeMillis()} timebase or {@code 0} to
+ * indicate that there is no expiry time associated with this blob.
* @param tag an opaque {@link String} associated with the blob. The length of the tag
* cannot be more than 128 characters.
*
diff --git a/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java b/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
index a838210..f53f1f1 100644
--- a/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
+++ b/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
@@ -266,6 +266,9 @@
* <p> This lease information is persisted and calling this more than once will result in
* latest lease overriding any previous lease.
*
+ * <p> When an app acquires a lease on a blob, the System will try to keep this
+ * blob around but note that it can still be deleted if it was requested by the user.
+ *
* @param blobHandle the {@link BlobHandle} representing the blob that the caller wants to
* acquire a lease for.
* @param descriptionResId the resource id for a short description string that can be surfaced
@@ -319,6 +322,9 @@
* <p> This lease information is persisted and calling this more than once will result in
* latest lease overriding any previous lease.
*
+ * <p> When an app acquires a lease on a blob, the System will try to keep this
+ * blob around but note that it can still be deleted if it was requested by the user.
+ *
* @param blobHandle the {@link BlobHandle} representing the blob that the caller wants to
* acquire a lease for.
* @param description a short description string that can be surfaced
@@ -371,6 +377,9 @@
* <p> This lease information is persisted and calling this more than once will result in
* latest lease overriding any previous lease.
*
+ * <p> When an app acquires a lease on a blob, the System will try to keep this
+ * blob around but note that it can still be deleted if it was requested by the user.
+ *
* @param blobHandle the {@link BlobHandle} representing the blob that the caller wants to
* acquire a lease for.
* @param descriptionResId the resource id for a short description string that can be surfaced
@@ -412,6 +421,9 @@
* <p> This lease information is persisted and calling this more than once will result in
* latest lease overriding any previous lease.
*
+ * <p> When an app acquires a lease on a blob, the System will try to keep this
+ * blob around but note that it can still be deleted if it was requested by the user.
+ *
* @param blobHandle the {@link BlobHandle} representing the blob that the caller wants to
* acquire a lease for.
* @param description a short description string that can be surfaced