diff options
| author | John Reck <jreck@google.com> | 2012-10-02 13:38:22 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-10-02 13:38:22 -0700 |
| commit | 3cf591b21556be79ecc8549ded191d3b4ccfd2ab (patch) | |
| tree | 8c495eaa1c178c89d03b21dffddd6c7239347aba | |
| parent | b11fb05ae8435dc90375ead6ecab62b7e10fb44f (diff) | |
| download | android_packages_apps_Snap-3cf591b21556be79ecc8549ded191d3b4ccfd2ab.tar.gz android_packages_apps_Snap-3cf591b21556be79ecc8549ded191d3b4ccfd2ab.tar.bz2 android_packages_apps_Snap-3cf591b21556be79ecc8549ded191d3b4ccfd2ab.zip | |
Fix NFC regression
Bug: 7263536
Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f
| -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); } } |