diff options
| author | John Reck <jreck@google.com> | 2012-10-02 13:51:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 13:51:04 -0700 |
| commit | 536ff1512fae7c8ad6ee276bf102269011fb6e50 (patch) | |
| tree | f8a99d97e37372593bd3ccfac987400285effb14 /src | |
| parent | 6423defee1d8ccf4d462d40ae4f82c7d73b11ab5 (diff) | |
| parent | 2619f20d30123a391cc6d37515fe8eb9d81d5029 (diff) | |
| download | android_packages_apps_Gallery2-536ff1512fae7c8ad6ee276bf102269011fb6e50.tar.gz android_packages_apps_Gallery2-536ff1512fae7c8ad6ee276bf102269011fb6e50.tar.bz2 android_packages_apps_Gallery2-536ff1512fae7c8ad6ee276bf102269011fb6e50.zip | |
Merge "Fix NFC regression" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/ActionModeHandler.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 408be3106..8e2356e7b 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -517,6 +517,7 @@ public class PhotoPage extends ActivityState implements NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mActivity); if (adapter != null) { + adapter.setBeamPushUris(null, mActivity); adapter.setBeamPushUrisCallback(new CreateBeamUrisCallback() { @Override public Uri[] createBeamUris(NfcEvent event) { diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index 830a21c95..c738f66e9 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -249,6 +249,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi @TargetApi(ApiHelper.VERSION_CODES.JELLY_BEAN) private void setNfcBeamPushUris(Uri[] uris) { if (mNfcAdapter != null && ApiHelper.HAS_SET_BEAM_PUSH_URIS) { + mNfcAdapter.setBeamPushUrisCallback(null, mActivity); mNfcAdapter.setBeamPushUris(uris, mActivity); } } |