summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-10-17 14:54:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-17 14:54:06 -0700
commit4104415e00090cdcac4a2f7408cc7ddc7d11c711 (patch)
tree47ab216d2eb599e5f7ab97cd15ac8edaad7565a4 /src
parent77a8da71dc3a2e12266e229d2687069f68d9fe59 (diff)
parent1c38d440b454698093f3f5c867b4bad5bf74716f (diff)
downloadandroid_packages_apps_Gallery2-4104415e00090cdcac4a2f7408cc7ddc7d11c711.tar.gz
android_packages_apps_Gallery2-4104415e00090cdcac4a2f7408cc7ddc7d11c711.tar.bz2
android_packages_apps_Gallery2-4104415e00090cdcac4a2f7408cc7ddc7d11c711.zip
Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index edaf8caa7..4cf73a886 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -316,8 +316,9 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
activity.startActivity(intent);
activity.finish();
} else {
- activity.setResult(Activity.RESULT_OK,
- new Intent(null, item.getContentUri()));
+ Intent intent = new Intent(null, item.getContentUri())
+ .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ activity.setResult(Activity.RESULT_OK, intent);
activity.finish();
}
}