commit ab821a517d6141e452fd64e03eb97e29cafb0c38
author Tomasz Mikolajewski <mtomasz@google.com> Thu Jan 28 04:20:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 28 04:20:43 2016 +0000
tree b7e1689359c04603701ba963d274341784736bbe
parent 4666057155f11acac61231ae55581b99f775492a
parent 7db9c8193797ad8bca6d191d5bbb2ec2f7dd1868

Merge "Unhide DocumentsContract.isTreeUri."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 350c50a..52cec47 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31544,6 +31544,7 @@
     method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);
     method public static java.lang.String getTreeDocumentId(android.net.Uri);
     method public static boolean isDocumentUri(android.content.Context, android.net.Uri);
+    method public static boolean isTreeUri(android.net.Uri);
     method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri);
     method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String);
     field public static final java.lang.String EXTRA_ERROR = "error";

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 8f7bd0b..e50b303 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33475,6 +33475,7 @@
     method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);
     method public static java.lang.String getTreeDocumentId(android.net.Uri);
     method public static boolean isDocumentUri(android.content.Context, android.net.Uri);
+    method public static boolean isTreeUri(android.net.Uri);
     method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri);
     method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String);
     field public static final java.lang.String EXTRA_ERROR = "error";

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 787c3cc..13e60bd 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -31557,6 +31557,7 @@
     method public static java.lang.String getSearchDocumentsQuery(android.net.Uri);
     method public static java.lang.String getTreeDocumentId(android.net.Uri);
     method public static boolean isDocumentUri(android.content.Context, android.net.Uri);
+    method public static boolean isTreeUri(android.net.Uri);
     method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri);
     method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String);
     field public static final java.lang.String EXTRA_ERROR = "error";

core/java/android/provider/DocumentsContract.java

diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index cdd88f6..6c3c661 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -835,7 +835,12 @@
         return uri != null && ContentResolver.SCHEME_CONTENT.equals(uri.getScheme());
     }
 
-    /** {@hide} */
+    /**
+     * Test if the given URI represents a {@link Document} tree.
+     *
+     * @see #buildTreeDocumentUri(String, String)
+     * @see #getTreeDocumentId(Uri, String)
+     */
     public static boolean isTreeUri(Uri uri) {
         final List<String> paths = uri.getPathSegments();
         return (paths.size() >= 2 && PATH_TREE.equals(paths.get(0)));