am 38c53ee8: am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev

* commit '38c53ee836c76b3aae4bb4815820a5401c017cc2':
  Mark PDB identifier as SystemApi

1 files changed, 4 insertions, 2 deletions

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 158a40cd2eb5..4e2aca0f4e43 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2883,12 +2883,14 @@ public abstract class Context {
 
     /**
      * Use with {@link #getSystemService} to retrieve a {@link
-     * android.service.persistentdata.PersistentDataBlockManager} instance retrieving
-     * a file descriptor for a persistent data block.
+     * android.service.persistentdata.PersistentDataBlockManager} instance
+     * for interacting with a storage device that lives across factory resets.
+     *
      * @see #getSystemService
      * @see android.service.persistentdata.PersistentDataBlockManager
      * @hide
      */
+    @SystemApi
     public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";
 
     /**