summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2020-03-10 02:35:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-10 02:35:54 +0000
commitb09e2c9584236f792a6aaa85ed6b03a190d1489a (patch)
tree846c06658e25af32402805b79ec5b2d19edf1a0b
parent2221a86262dee0b462b77ff90154c6fe4e655167 (diff)
parent38dae29cbb30d3eb6455af0ee2b70f8f88f07ea1 (diff)
Merge "Expose BlobStoreManager.waitForIdle() as @TestApi." into rvc-dev
-rw-r--r--apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java2
-rw-r--r--api/test-current.txt8
2 files changed, 10 insertions, 0 deletions
diff --git a/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java b/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
index 7af3f662c195..2d4765fea145 100644
--- a/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
+++ b/apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java
@@ -22,6 +22,7 @@ import android.annotation.IdRes;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.SystemService;
+import android.annotation.TestApi;
import android.content.Context;
import android.os.ParcelFileDescriptor;
import android.os.ParcelableException;
@@ -480,6 +481,7 @@ public class BlobStoreManager {
*
* @hide
*/
+ @TestApi
public void waitForIdle(long timeoutMillis) throws InterruptedException, TimeoutException {
try {
final CountDownLatch countDownLatch = new CountDownLatch(1);
diff --git a/api/test-current.txt b/api/test-current.txt
index dd6dd6c9529d..3ae7e52a31c2 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -590,6 +590,14 @@ package android.app.backup {
}
+package android.app.blob {
+
+ public class BlobStoreManager {
+ method public void waitForIdle(long) throws java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+ }
+
+}
+
package android.app.prediction {
public final class AppPredictionContext implements android.os.Parcelable {