diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index df72f783727095c68a676138d5f2d2e0dfa5aeef..79a1939411e140b91c15dc17826211234bfcc617 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -685,7 +685,7 @@ public abstract class PhotoPage extends ActivityState implements
                  if (mModel != null && mModel.getMediaItem(0) != null) {
                  Uri uri = mActivity.getDataManager().getContentUri(mModel.getMediaItem(0).getPath());
                  mActivity.isTopMenuShow = true;
-                 mShareIntent.setDataAndType(uri, MenuExecutor.getMimeType(mModel
+                 mShareIntent.setType(MenuExecutor.getMimeType(mModel
                     .getMediaItem(0).getMediaType()));
                  mShareIntent.putExtra(Intent.EXTRA_STREAM, uri);
                  String shareTitle = mActivity.getResources().
diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index 605de39e8bd4aa33e91669c26d834af55ea568e4..b46a39307de5ba30890c017be7c56a21abb62809 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -386,7 +386,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi
                 intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
             } else {
                 intent.setAction(Intent.ACTION_SEND);
-                intent.setDataAndType(uris.get(0), GalleryUtils.MIME_TYPE_PANORAMA360);
+                intent.setType(GalleryUtils.MIME_TYPE_PANORAMA360);
                 intent.putExtra(Intent.EXTRA_STREAM, uris.get(0));
             }
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -425,7 +425,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi
                 intent.setAction(Intent.ACTION_SEND_MULTIPLE).setType(mimeType);
                 intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
             } else {
-                intent.setAction(Intent.ACTION_SEND).setDataAndType(uris.get(0), mimeType);
+                intent.setAction(Intent.ACTION_SEND).setType(mimeType);
                 intent.putExtra(Intent.EXTRA_STREAM, uris.get(0));
             }
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);