commit f1a5edb6b4278158d6f9c460eb690fe5ac81840d
author Suhas Suresh <suhas.suresh_1@nxp.com> Fri Apr 27 11:18:14 2018 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Thu Jun 14 13:30:07 2018 +0530
tree e2eb44907551744471ed338fbf9acf5953013aa1
parent 28342233a5688112f388e9872347927a1120b480

Terminate server threads on NFC disable

When server socket closes, the while loop for incoming socket should be
terminated immediately.

Do not show IOException thrown from serverSocket.accept() as an error
since it's expected.

Change-Id: Ie5cfb15dd6b2d899dde83e5c613d85d0cc8fecb2

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
old mode 100755
new mode 100644
index 4d8ddf9..4a73162
--- 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
old mode 100755
new mode 100644
index f2e9c0c..33b6406
--- 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) {