Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	nxp/jni/com_android_nfc_NativeNfcManager.cpp
	nxp/jni/com_android_nfc_NativeNfcTag.cpp
	res/values-nl/strings.xml

Change-Id: I2e53f288cd65fc179d5c385971e703f6eda0c232

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/nfc/snep/SnepClient.java b/src/com/android/nfc/snep/SnepClient.java
index fae8143f..03824ccd 100644
--- a/src/com/android/nfc/snep/SnepClient.java
+++ b/src/com/android/nfc/snep/SnepClient.java
@@ -157,6 +157,9 @@ public final class SnepClient {
             int fragmentLength = (mFragmentLength == -1) ?  miu : Math.min(miu, mFragmentLength);
             messenger = new SnepMessenger(true, socket, fragmentLength);
         } catch (LlcpException e) {
+            synchronized (this) {
+                mState = DISCONNECTED;
+            }
             throw new IOException("Could not connect to socket");
         } catch (IOException e) {
             if (socket != null) {
@@ -165,6 +168,9 @@ public final class SnepClient {
                 } catch (IOException e2) {
                 }
             }
+            synchronized (this) {
+                mState = DISCONNECTED;
+            }
             throw new IOException("Failed to connect to socket");
         }