summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-10-17 14:54:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-17 14:54:55 -0700
commit65e9599cffe6f44cd1f7824f838312d41e9473ef (patch)
tree6b3733c640886831e0c18e989166a33632905864
parent3ef60c6413ce5dd0bdda7f58fdcf4c4854a967b8 (diff)
parentd4f457e0133bac5e3b172a1261a36ff62c39953c (diff)
downloadandroid_packages_apps_Snap-65e9599cffe6f44cd1f7824f838312d41e9473ef.tar.gz
android_packages_apps_Snap-65e9599cffe6f44cd1f7824f838312d41e9473ef.tar.bz2
android_packages_apps_Snap-65e9599cffe6f44cd1f7824f838312d41e9473ef.zip
am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
* commit '4104415e00090cdcac4a2f7408cc7ddc7d11c711': Add read URI permission to intent returned for GET_CONTENT
-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();
}
}