commit 5a2910f7a80d963a7d04b4bcaf908da4b512bec7
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 30 01:06:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 30 01:06:45 2017 +0000
tree 60ba6f7dc274496eb6df587db536f389a538c197
parent 391314b7633c962a93753b0a8ebc77ee5bd40b10
parent 65b2cd219640bb23e0571d0fcc73f90a3b4560af

Merge "Terminate server threads on NFC disable"

src/com/android/nfc/handover/HandoverServer.java

diff --git a/src/com/android/nfc/handover/HandoverServer.java b/src/com/android/nfc/handover/HandoverServer.java
index 23ac1d9..c2b4153 100644
--- a/src/com/android/nfc/handover/HandoverServer.java
+++ b/src/com/android/nfc/handover/HandoverServer.java
@@ -129,7 +129,7 @@
                 } catch (LlcpException e) {
                     Log.e(TAG, "llcp error", e);
                 } catch (IOException e) {
-                    Log.e(TAG, "IO error", e);
+                    if (DBG) Log.d(TAG, "IO error");
                 } finally {
                     synchronized (HandoverServer.this) {
                         if (mServerSocket != null) {

src/com/android/nfc/ndefpush/NdefPushServer.java

diff --git a/src/com/android/nfc/ndefpush/NdefPushServer.java b/src/com/android/nfc/ndefpush/NdefPushServer.java
index bf92c17..82b37de 100755
--- a/src/com/android/nfc/ndefpush/NdefPushServer.java
+++ b/src/com/android/nfc/ndefpush/NdefPushServer.java
@@ -165,7 +165,7 @@
                 } catch (LlcpException e) {
                     Log.e(TAG, "llcp error", e);
                 } catch (IOException e) {
-                    Log.e(TAG, "IO error", e);
+                    if (DBG) Log.d(TAG, "IO error");
                 } finally {
                     synchronized (NdefPushServer.this) {
                         if (mServerSocket != null) {

src/com/android/nfc/snep/SnepServer.java

diff --git a/src/com/android/nfc/snep/SnepServer.java b/src/com/android/nfc/snep/SnepServer.java
index f2e9c0c..33b6406 100644
--- a/src/com/android/nfc/snep/SnepServer.java
+++ b/src/com/android/nfc/snep/SnepServer.java
@@ -228,7 +228,7 @@
                 } catch (LlcpException e) {
                     Log.e(TAG, "llcp error", e);
                 } catch (IOException e) {
-                    Log.e(TAG, "IO error", e);
+                    if (DBG) Log.d(TAG, "IO error");
                 } finally {
                     synchronized (SnepServer.this) {
                         if (mServerSocket != null) {