From 0f2b555fe51f3d8a828cf61d269b8be6eecbf68b Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Fri, 18 May 2012 11:04:31 -0700
Subject: Don't use NPP for connection handover.

Handover will only work with SNEP; if SNEP fails,
don't try with NPP.

Change-Id: Ib92c90cb588b99e177fa1c70b89753ef8d0e16ea
---
 src/com/android/nfc/P2pLinkManager.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;
 
-- 
cgit v1.1