From e75dcfbdfd758bf832b3bd8f083b059ecb06e6d4 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Mon, 23 Mar 2020 11:51:45 -0700
Subject: [PATCH] Promote getLeasedBlobs() to be a public API.

This would allow apps to know which blobs they currently
hold a lease on and release any if they are running out
of lease quota.

Bug: 152219149
Test: atest --test-mapping apex/blobstore
Change-Id: I0141cfcd7cdbb83dbc75be11463ab90ee3c3f7cc
---
 .../framework/java/android/app/blob/BlobStoreManager.java   | 6 ++----
 api/current.txt                                             | 1 +
 api/test-current.txt                                        | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java b/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
index cb87c6cefef58..3f254c0435788 100644
--- a/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
+++ b/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
@@ -563,12 +563,10 @@ public class BlobStoreManager {
 
     /**
      * Return the {@link BlobHandle BlobHandles} corresponding to the data blobs that
-     * the calling app has acquired a lease on using {@link #acquireLease(BlobHandle, int)} or
-     * one of it's other variants.
+     * the calling app currently has a lease on.
      *
-     * @hide
+     * @return a list of {@link BlobHandle BlobHandles} that the caller has a lease on.
      */
-    @TestApi
     @NonNull
     public List<BlobHandle> getLeasedBlobs() throws IOException {
         try {
diff --git a/api/current.txt b/api/current.txt
index c19a70c5c250c..680b2248249a9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7605,6 +7605,7 @@ package android.app.blob {
     method public void acquireLease(@NonNull android.app.blob.BlobHandle, @IdRes int) throws java.io.IOException;
     method public void acquireLease(@NonNull android.app.blob.BlobHandle, @NonNull CharSequence) throws java.io.IOException;
     method @IntRange(from=1) public long createSession(@NonNull android.app.blob.BlobHandle) throws java.io.IOException;
+    method @NonNull public java.util.List<android.app.blob.BlobHandle> getLeasedBlobs() throws java.io.IOException;
     method @IntRange(from=0) public long getRemainingLeaseQuotaBytes();
     method @NonNull public android.os.ParcelFileDescriptor openBlob(@NonNull android.app.blob.BlobHandle) throws java.io.IOException;
     method @NonNull public android.app.blob.BlobStoreManager.Session openSession(@IntRange(from=1) long) throws java.io.IOException;
diff --git a/api/test-current.txt b/api/test-current.txt
index 38cf6a16de564..0bd8a195edff9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -598,7 +598,6 @@ package android.app.blob {
 
   public class BlobStoreManager {
     method @Nullable public android.app.blob.LeaseInfo getLeaseInfo(@NonNull android.app.blob.BlobHandle) throws java.io.IOException;
-    method @NonNull public java.util.List<android.app.blob.BlobHandle> getLeasedBlobs() throws java.io.IOException;
     method public void waitForIdle(long) throws java.lang.InterruptedException, java.util.concurrent.TimeoutException;
   }