From ca181a68a30ad830d55eb8886f62a323c64e1ba3 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Tue, 16 Oct 2012 10:22:54 +0800 Subject: Add permission to GalleryProvider. bug: 7202384 Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4 --- src/com/android/gallery3d/app/PhotoPage.java | 18 ++++++++---------- src/com/android/gallery3d/ui/ActionModeHandler.java | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index ba9bf8c42..413167fbb 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -592,11 +592,10 @@ public class PhotoPage extends ActivityState implements private Intent createShareIntent(Path path) { DataManager manager = mActivity.getDataManager(); int type = manager.getMediaType(path); - Intent intent = new Intent(Intent.ACTION_SEND); - intent.setType(MenuExecutor.getMimeType(type)); - Uri uri = manager.getContentUri(path); - intent.putExtra(Intent.EXTRA_STREAM, uri); - return intent; + return new Intent(Intent.ACTION_SEND) + .setType(MenuExecutor.getMimeType(type)) + .putExtra(Intent.EXTRA_STREAM, manager.getContentUri(path)) + .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); } private Intent createSharePanoramaIntent(Path path) { @@ -605,11 +604,10 @@ public class PhotoPage extends ActivityState implements if ((supported & MediaObject.SUPPORT_PANORAMA360) == 0) { return null; } - Intent intent = new Intent(Intent.ACTION_SEND); - intent.setType(GalleryUtils.MIME_TYPE_PANORAMA360); - Uri uri = manager.getContentUri(path); - intent.putExtra(Intent.EXTRA_STREAM, uri); - return intent; + return new Intent(Intent.ACTION_SEND) + .setType(GalleryUtils.MIME_TYPE_PANORAMA360) + .putExtra(Intent.EXTRA_STREAM, manager.getContentUri(path)) + .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); } private void launchPhotoEditor() { diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index 8cebdddad..3384b88e3 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -280,6 +280,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi intent.setType(GalleryUtils.MIME_TYPE_PANORAMA360); intent.putExtra(Intent.EXTRA_STREAM, uris.get(0)); } + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); } return intent; @@ -315,6 +316,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi intent.setAction(Intent.ACTION_SEND).setType(mimeType); intent.putExtra(Intent.EXTRA_STREAM, uris.get(0)); } + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); setNfcBeamPushUris(uris.toArray(new Uri[uris.size()])); } else { setNfcBeamPushUris(null); -- cgit v1.2.3