commit d72b205b870f4bccb33d466a0b4f704aca8d060a
author Martijn Coenen <maco@google.com> Mon Apr 15 08:49:20 2013 -0700
committer Martijn Coenen <maco@google.com> Mon Apr 15 08:50:51 2013 -0700
tree a0e8bc8e48122215cb49c791fe6c67eb864e1982
parent 027f41e53396c19c9b7572c49b7663c2e268c9af

Remain compatible with 4.1 handover-over-SNEP devices.

Android Jelly Bean 4.1 shipped with a handover implementation
that (erroneously) used the SNEP server for exchanging handover
messages. This was corrected in future releases, however to maintain
compatibility with the 4.1 devices, continue connecting to SNEP
in case a connection to the handover service fails.

Bug: 8508568
Change-Id: I49ee98ef9c4569bdbff8aab4ee3f45264e019f3f

src/com/android/nfc/P2pLinkManager.java

diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index 4c8863b..4205c7a 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -643,7 +643,7 @@
                 }
             }
 
-            if (needsNdef) {
+            if (needsNdef || (needsHandover && handoverClient == null)) {
                 snepClient = new SnepClient();
                 try {
                     snepClient.connect();