diff options
| author | Martijn Coenen <maco@google.com> | 2012-05-18 11:04:31 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-05-18 11:08:35 -0700 |
| commit | 0f2b555fe51f3d8a828cf61d269b8be6eecbf68b (patch) | |
| tree | 932e4a64ec99666f787b889b1cb0b5e3a2a718bd /src/com/android | |
| parent | 1179ee22543abdd350f0a60b887e2fb7cf95d6a6 (diff) | |
| download | packages_apps_nfc-0f2b555fe51f3d8a828cf61d269b8be6eecbf68b.zip packages_apps_nfc-0f2b555fe51f3d8a828cf61d269b8be6eecbf68b.tar.gz packages_apps_nfc-0f2b555fe51f3d8a828cf61d269b8be6eecbf68b.tar.bz2 | |
Don't use NPP for connection handover.
Handover will only work with SNEP; if SNEP fails,
don't try with NPP.
Change-Id: Ib92c90cb588b99e177fa1c70b89753ef8d0e16ea
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/nfc/P2pLinkManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java index ecded75..2f70f39 100755 --- a/src/com/android/nfc/P2pLinkManager.java +++ b/src/com/android/nfc/P2pLinkManager.java @@ -405,7 +405,11 @@ public class P2pLinkManager implements Handler.Callback, P2pEventListener.Callba return null; } - result = new NdefPushClient().push(m); + if (m != null) { + result = new NdefPushClient().push(m); + } else { + result = false; + } } time = SystemClock.elapsedRealtime() - time; |