summaryrefslogtreecommitdiffstats
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
commitd4f457e0133bac5e3b172a1261a36ff62c39953c (patch)
treee83ef93271f70fb6b75a2e69a37298da5b67ce96
parent903c190fc10e7cf5c95bccc7cf0220375e25ea00 (diff)
parentdfbb1f436b6020bbc5c14794ef0e8f571adc2167 (diff)
downloadandroid_packages_apps_Snap-d4f457e0133bac5e3b172a1261a36ff62c39953c.tar.gz
android_packages_apps_Snap-d4f457e0133bac5e3b172a1261a36ff62c39953c.tar.bz2
android_packages_apps_Snap-d4f457e0133bac5e3b172a1261a36ff62c39953c.zip
Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
-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();
}
}