commit 7f3f25eeb59c95a81d1c7a667f1553285e2eca09
author Jeff Sharkey <jsharkey@android.com> Thu Sep 26 13:40:34 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 26 13:40:34 2013 -0700
tree 08f4f121fef127abdde005cc5fa67289f2e52578
parent 77721573aa3ca41b2e34d8127840fe77a9009579
parent cf711ce828e75a250495282f61c25c0d9dba377e

am 66ee877f: am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev

* commit '66ee877f5d27b4dd4081702ad216359971e1b8b3':
  Tighten flags enforcement, API to test Uris.

src/com/android/documentsui/TestActivity.java

diff --git a/src/com/android/documentsui/TestActivity.java b/src/com/android/documentsui/TestActivity.java
index 9861399..57fc7e4 100644
--- a/src/com/android/documentsui/TestActivity.java
+++ b/src/com/android/documentsui/TestActivity.java
@@ -21,6 +21,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.provider.DocumentsContract;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -209,6 +210,9 @@
         if (requestCode == CODE_READ) {
             final Uri uri = data != null ? data.getData() : null;
             if (uri != null) {
+                if (DocumentsContract.isDocumentUri(this, uri)) {
+                    result += "; DOC_ID";
+                }
                 getContentResolver()
                         .takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
                 InputStream is = null;
@@ -228,6 +232,9 @@
         } else if (requestCode == CODE_WRITE) {
             final Uri uri = data != null ? data.getData() : null;
             if (uri != null) {
+                if (DocumentsContract.isDocumentUri(this, uri)) {
+                    result += "; DOC_ID";
+                }
                 getContentResolver()
                         .takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                 OutputStream os = null;