diff options
| author | Martijn Coenen <maco@google.com> | 2012-04-13 15:25:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-13 15:25:01 -0700 |
| commit | 483203d37da239d9c455239791c1defe2acdfa37 (patch) | |
| tree | 9ee71701cfa829d19169ae94ba5c82b69ca9c3c7 | |
| parent | b8346f6d7910ae06d4572fd49c3aa4011e69f002 (diff) | |
| parent | a41ed05ff2f71d2177b4f24f53acd848b46fc840 (diff) | |
| download | android_packages_apps_Gallery2-483203d37da239d9c455239791c1defe2acdfa37.tar.gz android_packages_apps_Gallery2-483203d37da239d9c455239791c1defe2acdfa37.tar.bz2 android_packages_apps_Gallery2-483203d37da239d9c455239791c1defe2acdfa37.zip | |
Merge "Use new Beam push API."
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 9f12ffde8..8797f84e5 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -270,8 +270,8 @@ public class PhotoPage extends ActivityState intent.putExtra(Intent.EXTRA_STREAM, manager.getContentUri(path)); mShareActionProvider.setShareIntent(intent); if (mNfcAdapter != null) { - mNfcAdapter.setBeamPushUri(MenuExecutor.getMimeType(type), - manager.getContentUri(path), (Activity)mActivity); + mNfcAdapter.setBeamPushUris(new Uri[]{manager.getContentUri(path)}, + (Activity)mActivity); } mPendingSharePath = null; } else { |