diff options
| author | Andres Morales <anmorales@google.com> | 2014-12-04 19:32:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-04 19:32:01 +0000 |
| commit | f96571b19f6a44758601461de3cd57e926d217e3 (patch) | |
| tree | fad53d1b7cbbd336f57131a24295a6b230f1f7f3 | |
| parent | c712fc9ba586db6d5f7c39e70223596d367b6695 (diff) | |
| parent | 616980fe53b2595f6320d344a6b8ebb0e898485e (diff) | |
| download | android_packages_apps_Nfc-f96571b19f6a44758601461de3cd57e926d217e3.tar.gz android_packages_apps_Nfc-f96571b19f6a44758601461de3cd57e926d217e3.tar.bz2 android_packages_apps_Nfc-f96571b19f6a44758601461de3cd57e926d217e3.zip | |
Merge "Remove B' polling for B tags" into lmp-mr1-dev
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index fd51c41d..82eba2dd 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -993,8 +993,7 @@ public class NfcService implements DeviceHostListener { Map<Integer, Integer> techCodeToMask = new HashMap<Integer, Integer>(); techCodeToMask.put(TagTechnology.NFC_A, NfcService.NFC_POLL_A); - techCodeToMask.put(TagTechnology.NFC_B, - NfcService.NFC_POLL_B | NfcService.NFC_POLL_B_PRIME); + techCodeToMask.put(TagTechnology.NFC_B, NfcService.NFC_POLL_B); techCodeToMask.put(TagTechnology.NFC_V, NfcService.NFC_POLL_ISO15693); techCodeToMask.put(TagTechnology.NFC_F, NfcService.NFC_POLL_F); techCodeToMask.put(TagTechnology.NFC_BARCODE, NfcService.NFC_POLL_KOVIO); |