From f56f7589bf0e7db3fc5de89aed80779ed6534994 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Wed, 29 Jan 2020 10:29:42 -0800
Subject: [PATCH] Make Context.BLOB_STORE_SERVICE public.

Bug: 143559646
Test: atest cts/tests/BlobStore/src/com/android/cts/blob/BlobStoreManagerTest.java
Change-Id: I2ae498803614761f1eab0927ab9e3c77dd65e1a1
---
 api/current.txt                        | 1 +
 api/test-current.txt                   | 1 -
 core/java/android/content/Context.java | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 2e99edd2ea50e..e79f10a1c16aa 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10112,6 +10112,7 @@ package android.content {
     field public static final int BIND_NOT_PERCEPTIBLE = 256; // 0x100
     field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20
     field public static final String BIOMETRIC_SERVICE = "biometric";
+    field public static final String BLOB_STORE_SERVICE = "blob_store";
     field public static final String BLUETOOTH_SERVICE = "bluetooth";
     field public static final String CAMERA_SERVICE = "camera";
     field public static final String CAPTIONING_SERVICE = "captioning";
diff --git a/api/test-current.txt b/api/test-current.txt
index e7a0cf6c2f4d9..6a8fa604e5fc0 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -767,7 +767,6 @@ package android.content {
     method public void setAutofillOptions(@Nullable android.content.AutofillOptions);
     method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);
     method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);
-    field public static final String BLOB_STORE_SERVICE = "blob_store";
     field public static final String BUGREPORT_SERVICE = "bugreport";
     field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
     field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle";
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 58a0ea56a65fc..49cfad8b10884 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5067,11 +5067,7 @@ public abstract class Context {
      *
      * @see #getSystemService(String)
      * @see android.app.blob.BlobStoreManager
-     *
-     * TODO: make this public once BlobStoreManager is ready.
-     * @hide
      */
-    @TestApi
     public static final String BLOB_STORE_SERVICE = "blob_store";
 
     /**