summaryrefslogtreecommitdiffstats
path: root/nci
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-09-16 18:13:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 18:13:31 +0000
commitc885ba3b088ae26ab468e5ea4266253beb80ef46 (patch)
tree84a71cb5a023cbfbb836b08b9b93cd3a2556683b /nci
parent6d7d399949d31f21d27019ad58369e14d9863a67 (diff)
parent894c9fe393dbd26bd48d70fcee9478c94b5c5bd8 (diff)
downloadandroid_packages_apps_Nfc-c885ba3b088ae26ab468e5ea4266253beb80ef46.tar.gz
android_packages_apps_Nfc-c885ba3b088ae26ab468e5ea4266253beb80ef46.tar.bz2
android_packages_apps_Nfc-c885ba3b088ae26ab468e5ea4266253beb80ef46.zip
am 894c9fe3: am b5370c06: Merge "Don\'t report tag as NdefFormatable if already NDEF." into lmp-dev
* commit '894c9fe393dbd26bd48d70fcee9478c94b5c5bd8': Don't report tag as NdefFormatable if already NDEF.
Diffstat (limited to 'nci')
-rwxr-xr-xnci/src/com/android/nfc/dhimpl/NativeNfcTag.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java b/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java
index 39a12268..ac7d6b80 100755
--- a/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java
+++ b/nci/src/com/android/nfc/dhimpl/NativeNfcTag.java
@@ -812,6 +812,7 @@ public class NativeNfcTag implements TagEndpoint {
getConnectedLibNfcType(),
getConnectedTechnology(),
supportedNdefLength, cardState);
+ foundFormattable = false;
reconnect();
}
break;