commit aa1bcd95cfd42b74106680d29e44c70b82dca742
author Andres Morales <anmorales@google.com> Sat Sep 27 05:27:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 27 05:27:03 2014 +0000
tree 8012a9f6d590c84db5af3de926758a57fe5af064
parent 1c2bb0c72ee1063cbb315736fcd0c356c9558c47
parent 66b63cb825b37079ea0d50e1482064d118620822

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

* commit '858d04cbf0962acba1ffc0e5df4113c01ed3abec':
  Mark PDB identifier as SystemApi

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 158a40c..4e2aca0 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2883,12 +2883,14 @@
 
     /**
      * 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";
 
     /**