summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-11-28Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-devandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1M7630AABBQMLZA40901040AU_LINUX_ANDROID_JB_2.5.3.04.02.02.54.060AU_LINUX_ANDROID_JB_2.5.3.04.02.02.054.066AU_LINUX_ANDROID_JB_2.5.3.04.02.02.054.065jb_2.5.3aosp-new/tools_r22aosp-new/jb-mr1.1-releaseaosp-new/jb-mr1.1-dev-plus-aospaosp-new/jb-mr1.1-devMartijn Coenen1-1/+13
2012-11-27NDEF Type 3 tag reading with padding bytesSunil Jogi1-1/+13
2012-11-27Increase default IsoDep timeout to 1200ms.Martijn Coenen1-1/+1
2012-08-30am e4d3c945: Merge "Add support for target-customized NFC stack configuration"android-sdk-support_r11android-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1M8974AAAAANLYA0050029M8974AAAAANLYA0050021M8974AAAAANLYA0050014M8974AAAAANLYA0050004M8960AAAAANLYA2540092M8960AAAAANLYA2320M8960AAAAANLYA2304M8960AAAAANLYA2303M8960AAAAANLYA2302M8960AAAAANLYA2301M8960AAAAANLYA106313M8960AAAAANLYA106312M8960AAAAANLYA106311M8960AAAAANLYA106310M8960AAAAANLYA106309M8960AAAAANLYA106308M8960AAAAANLYA106307M8960AAAAANLYA106306M8960AAAAANLYA106305M8930AAAAANLYA4020M8930AAAAANLYA4003M8930AAAAANLYA3015M8930AAAAANLYA2540129M8930AAAAANLYA2505M8930AAAAANLYA2504127M8930AAAAANLYA2504M8930AAAAANLYA2503M8930AAAAANLYA2502M8930AAAAANLYA2501M8930AAAAANLYA17415M8930AAAAANLYA17320M8930AAAAANLYA17304M7630AABBQMLZA40901030M7630AABBQMLZA40901020M7630AABBQMLZA40901010M7630AABBQMLZA40901000AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.013AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.012AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.011AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.010AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.008AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.007AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.006AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.003AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.029AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.028AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.025AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.024AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.023AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.021AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.018AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.017AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.016AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.015AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.014AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.012AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.011AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.010AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.009AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.008AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.004AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.003AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.002AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.01.43.026AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.01.43.025AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.01.43.024AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.023AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.022AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.020AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.019AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.018AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.016AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.015AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.014AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.013AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.012AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.010AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.009AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.005AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.004AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.003AU_LINUX_ANDROID_JB_MR1.04.02.01.49.119AU_LINUX_ANDROID_JB_MR1.04.02.01.49.118AU_LINUX_ANDROID_JB_MR1.04.02.01.49.117AU_LINUX_ANDROID_JB_MR1.04.02.01.49.116AU_LINUX_ANDROID_JB_MR1.04.02.01.49.115AU_LINUX_ANDROID_JB_MR1.04.02.01.49.114AU_LINUX_ANDROID_JB_MR1.04.02.01.49.113AU_LINUX_ANDROID_JB_MR1.04.02.01.49.112AU_LINUX_ANDROID_JB_MR1.04.02.01.49.105AU_LINUX_ANDROID_JB_MR1.04.02.01.49.104AU_LINUX_ANDROID_JB_MR1.04.02.01.49.102AU_LINUX_ANDROID_JB_MR1.04.02.01.49.098AU_LINUX_ANDROID_JB_MR1.04.02.01.49.096AU_LINUX_ANDROID_JB_MR1.04.02.01.49.091AU_LINUX_ANDROID_JB_MR1.04.02.01.49.090AU_LINUX_ANDROID_JB_MR1.04.02.01.49.089AU_LINUX_ANDROID_JB_MR1.04.02.01.49.087AU_LINUX_ANDROID_JB_MR1.04.02.01.49.086AU_LINUX_ANDROID_JB_MR1.04.02.01.49.085AU_LINUX_ANDROID_JB_MR1.04.02.01.49.084AU_LINUX_ANDROID_JB_MR1.04.02.01.49.083AU_LINUX_ANDROID_JB_MR1.04.02.01.49.082AU_LINUX_ANDROID_JB_MR1.04.02.01.49.081AU_LINUX_ANDROID_JB_MR1.04.02.01.49.077AU_LINUX_ANDROID_JB_MR1.04.02.01.49.075AU_LINUX_ANDROID_JB_MR1.04.02.01.49.074AU_LINUX_ANDROID_JB_MR1.04.02.01.49.072AU_LINUX_ANDROID_JB_MR1.04.02.01.49.071AU_LINUX_ANDROID_JB_MR1.04.02.01.49.070AU_LINUX_ANDROID_JB_MR1.04.02.01.49.069AU_LINUX_ANDROID_JB_MR1.04.02.01.49.068AU_LINUX_ANDROID_JB_MR1.04.02.01.49.067AU_LINUX_ANDROID_JB_MR1.04.02.01.49.058AU_LINUX_ANDROID_JB_MR1.04.02.00.49.051AU_LINUX_ANDROID_JB_MR1.04.02.00.49.041AU_LINUX_ANDROID_JB_MR1.04.02.00.49.040AU_LINUX_ANDROID_JB_MR1.04.02.00.49.038AU_LINUX_ANDROID_JB_MR1.04.02.00.49.033AU_LINUX_ANDROID_JB_MR1.04.02.00.49.020AU_LINUX_ANDROID_JB_MR1.04.02.00.49.019AU_LINUX_ANDROID_JB_MR1.04.02.00.49.018AU_LINUX_ANDROID_JB_MR1.04.02.00.49.017AU_LINUX_ANDROID_JB_MR1.04.02.00.49.016AU_LINUX_ANDROID_JB_MR1.04.02.00.49.015AU_LINUX_ANDROID_JB_MR1.04.02.00.49.014AU_LINUX_ANDROID_JB_MR1.04.02.00.49.012AU_LINUX_ANDROID_JB_MR1.04.02.00.49.008AU_LINUX_ANDROID_JB_MR1.04.02.00.49.007AU_LINUX_ANDROID_JB_2.5_NEXT.04.02.00.48.003AU_LINUX_ANDROID_JB_2.5.3_RB1.04.02.00.67.003AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.047AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.027AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.017AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.011AU_LINUX_ANDROID_JB_2.5.1.04.02.00.64.001AU_LINUX_ANDROID_JB_2.5.04.02.01.40.146AU_LINUX_ANDROID_JB_2.5.04.02.01.40.145AU_LINUX_ANDROID_JB_2.5.04.02.01.40.144AU_LINUX_ANDROID_JB_2.5.04.02.01.40.143AU_LINUX_ANDROID_JB_2.5.04.02.01.40.142AU_LINUX_ANDROID_JB_2.5.04.02.01.40.141AU_LINUX_ANDROID_JB_2.5.04.02.01.40.140AU_LINUX_ANDROID_JB_2.5.04.02.01.40.134AU_LINUX_ANDROID_JB_2.5.04.02.01.40.133AU_LINUX_ANDROID_JB_2.5.04.02.01.40.131AU_LINUX_ANDROID_JB_2.5.04.02.01.40.130AU_LINUX_ANDROID_JB_2.5.04.02.01.40.129AU_LINUX_ANDROID_JB_2.5.04.02.01.40.128AU_LINUX_ANDROID_JB_2.5.04.02.01.40.127AU_LINUX_ANDROID_JB_2.5.04.02.01.40.126AU_LINUX_ANDROID_JB_2.5.04.02.01.40.124AU_LINUX_ANDROID_JB_2.5.04.02.01.40.120AU_LINUX_ANDROID_JB_2.5.04.02.01.40.118AU_LINUX_ANDROID_JB_2.5.04.02.01.40.117AU_LINUX_ANDROID_JB_2.5.04.02.01.40.116AU_LINUX_ANDROID_JB_2.5.04.02.01.40.110AU_LINUX_ANDROID_JB_2.5.04.02.01.40.109AU_LINUX_ANDROID_JB_2.5.04.02.01.40.108AU_LINUX_ANDROID_JB_2.5.04.02.01.40.107AU_LINUX_ANDROID_JB_2.5.04.02.01.40.106AU_LINUX_ANDROID_JB_2.5.04.02.01.40.105AU_LINUX_ANDROID_JB_2.5.04.02.01.40.104AU_LINUX_ANDROID_JB_2.5.04.02.01.40.102AU_LINUX_ANDROID_JB_2.5.04.02.01.40.101AU_LINUX_ANDROID_JB_2.5.04.02.01.40.100AU_LINUX_ANDROID_JB_2.5.04.02.01.40.099AU_LINUX_ANDROID_JB_2.5.04.02.01.40.098AU_LINUX_ANDROID_JB_2.5.04.02.01.40.097AU_LINUX_ANDROID_JB_2.5.04.02.01.40.096AU_LINUX_ANDROID_JB_2.5.04.02.01.40.095AU_LINUX_ANDROID_JB_2.5.04.02.01.40.094AU_LINUX_ANDROID_JB_2.5.04.02.01.40.093AU_LINUX_ANDROID_JB_2.5.04.02.01.40.092AU_LINUX_ANDROID_JB_2.5.04.02.01.40.091AU_LINUX_ANDROID_JB_2.5.04.02.01.40.090AU_LINUX_ANDROID_JB_2.5.04.02.01.40.089AU_LINUX_ANDROID_JB_2.5.04.02.01.40.085AU_LINUX_ANDROID_JB_2.5.04.02.00.40.083AU_LINUX_ANDROID_JB_2.5.04.02.00.40.082AU_LINUX_ANDROID_JB_2.5.04.02.00.40.079AU_LINUX_ANDROID_JB_2.5.04.02.00.40.078AU_LINUX_ANDROID_JB_2.5.04.02.00.40.077AU_LINUX_ANDROID_JB_2.5.04.02.00.40.075AU_LINUX_ANDROID_JB_2.5.04.02.00.40.074AU_LINUX_ANDROID_JB_2.5.04.02.00.40.072AU_LINUX_ANDROID_JB_2.5.04.02.00.40.070AU_LINUX_ANDROID_JB_2.5.04.02.00.40.068AU_LINUX_ANDROID_JB_2.5.04.02.00.40.066AU_LINUX_ANDROID_JB_2.5.04.02.00.40.064AU_LINUX_ANDROID_JB_2.5.04.02.00.40.061AU_LINUX_ANDROID_JB_2.5.04.02.00.40.059AU_LINUX_ANDROID_JB_2.5.04.02.00.40.055AU_LINUX_ANDROID_JB_2.5.04.02.00.40.054AU_LINUX_ANDROID_JB_2.5.04.02.00.40.053AU_LINUX_ANDROID_JB_2.5.04.02.00.40.052AU_LINUX_ANDROID_JB_2.5.04.02.00.40.051AU_LINUX_ANDROID_JB_2.5.04.02.00.40.050AU_LINUX_ANDROID_JB_2.5.04.02.00.40.049AU_LINUX_ANDROID_JB_2.5.04.02.00.40.048AU_LINUX_ANDROID_JB_2.5.04.02.00.40.047AU_LINUX_ANDROID_JB_2.5.04.02.00.40.046AU_LINUX_ANDROID_JB_2.5.04.02.00.40.043AU_LINUX_ANDROID_JB_2.5.04.02.00.40.042AU_LINUX_ANDROID_JB_2.5.04.02.00.40.041AU_LINUX_ANDROID_JB_2.5.04.02.00.40.040AU_LINUX_ANDROID_JB_2.5.04.02.00.40.036AU_LINUX_ANDROID_JB_2.5.04.02.00.40.030AU_LINUX_ANDROID_JB_2.5.04.02.00.40.027AU_LINUX_ANDROID_JB_2.5.04.02.00.40.024AU_LINUX_ANDROID_JB_2.5.04.02.00.40.023AU_LINUX_ANDROID_JB_2.5.04.02.00.40.022AU_LINUX_ANDROID_JB_2.5.04.02.00.40.021AU_LINUX_ANDROID_JB_2.5.04.02.00.40.020AU_LINUX_ANDROID_JB_2.5.04.02.00.40.019AU_LINUX_ANDROID_JB_2.5.04.02.00.40.018AU_LINUX_ANDROID_JB_2.5.04.02.00.40.016AU_LINUX_ANDROID_JB_2.5.04.02.00.40.015AU_LINUX_ANDROID_JB_2.5.04.02.00.40.010AU_LINUX_ANDROID_JB_2.5.04.02.00.40.009AU_LINUX_ANDROID_JB_2.5.04.02.00.40.008A8064AAAAANLYA2540008A8064AAAAANLYA1912A8064AAAAANLYA1911A8064AAAAANLYA1631FA8064AAAAANLYA1631A8064AAAAANLYA1630A8064AAAAANLYA1624A8064AAAAANLYA1623BA8064AAAAANLYA1623A8064AAAAANLYA1622AA8064AAAAANLYA1622A8064AAAAANLYA1621DA8064AAAAANLYA1621CA8064AAAAANLYA16210A8064AAAAANLYA161022A8064AAAAANLYA161021A8064AAAAANLYA161020A8064AAAAANLYA161012A8064AAAAANLYA161011A8064AAAAANLYA161010A8064AAAAANLYA14111A8064AAAAANLYA14110A8064AAAAANLGA1623Ajb_mr1_rb1.9jb_mr1_rb1.8jb_mr1_rb1.7jb_mr1_rb1.6jb_mr1_rb1.5jb_mr1_rb1.4jb_mr1_rb1.3jb_mr1_rb1.2jb_mr1_rb1.13jb_mr1_rb1.12jb_mr1_rb1.11jb_mr1_rb1.1jb_2.5_nextjb_2.5.3_rb1.1aosp-new/jb-mr1-releaseaosp-new/jb-mr1-dev-plus-aospaosp-new/jb-mr1-devMartijn Coenen2-19/+23
2012-08-30Merge "Add support for target-customized NFC stack configuration"aosp-new/tools_r21Martijn Coenen2-19/+23
2012-08-29am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton1-0/+1
2012-08-29am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton1-1/+4
2012-08-29Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton1-0/+1
2012-08-29Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton1-1/+4
2012-08-23Add support for target-customized NFC stack configurationSebastian Niciarz2-19/+23
2012-08-14HCI ANY_OPEN_PIPE on identity management gate crash fixDejan REBRACA1-0/+1
2012-08-14Support of topaz tag NFC Forum version number 1.1Dejan REBRACA1-1/+4
2012-07-17phHal4Nfc_ADD: fix memcpy overlapNick Kralevich1-5/+8
2012-07-17phFriNfc_OvrHal: fix memcpy overlapNick Kralevich1-1/+4
2012-06-19am b668d06f: Reconcile with jb-releaseThe Android Open Source Project0-0/+0
2012-06-19Reconcile with jb-releaseThe Android Open Source Project0-0/+0
2012-06-14Revert "Added addr field in response of Jewel command"android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1M8974AAAAANLYA0000036M8960AAAAANLYA2205M8960AAAAANLYA2003M8960AAAAANLYA1723JM8960AAAAANLYA1074JM8960AAAAANLYA10741JM8960AAAAANLYA100713PM8960AAAAANLYA100713OM8960AAAAANLYA100713NM8960AAAAANLYA100713MM8960AAAAANLYA100713LM8960AAAAANLYA100713KM8960AAAAANLYA100713JM8930AAAAANLYA2002018M8930AAAAANLYA1030JM8930AAAAANLYA1021JM8625SSNSKMLYA1215M8625SSNSKMLYA1210M8260AAABQNLZA313035M8260AAABQNLZA313030M8260AAABQNLZA223010M76XXUSNEKNLYA2515M76XXUSNEKNLYA2510M7630AABBQMLZA40701010M7630AABBQMLZA40701000A8064AAAAANLYA1312A8064AAAAANLYA101013A8064AAAAANLYA101012A8064AAAAANLYA101011jb_chocolateaosp-new/jb-releaseaosp-new/jb-mr0-releaseMartijn Coenen1-63/+0
2012-06-14am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen1-63/+0
2012-06-14am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen1-63/+0
2012-06-14Revert "Added addr field in response of Jewel command"android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1aosp-new/jb-devMartijn Coenen1-63/+0
2012-06-13merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-06-12am 55d095b1: (-s ours) am 144d72d3: Remove some logs in case of abort() (DO N...Martijn Coenen0-0/+0
2012-06-12am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen1-4/+2
2012-06-12Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen1-4/+2
2012-06-08Remove some logs in case of abort().Martijn Coenen1-4/+3
2012-05-24Reconcile with jb-releaseThe Android Open Source Project0-0/+0
2012-05-24merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-05-23am ba040759: Fix wrong extern variable sizeSunil Jogi1-1/+1
2012-05-23Fix wrong extern variable sizeSunil Jogi1-1/+1
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project0-0/+0
2012-04-23merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-04-20Merge "Added recovery function when SE wired mode selected"Martijn Coenen3-0/+19
2012-04-19Add NOTICE and MODULE_LICENSE_APACHE filesWei Zhong2-0/+189
2012-04-19Fix T2T makeReadonly.Martijn Coenen1-1/+1
2012-04-18merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-04-17Added addr field in response of Jewel commandSunil Jogi1-0/+63
2012-04-13Added recovery function when SE wired mode selectedSunil Jogi3-0/+19
2012-04-09merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-04-02Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi3-14/+16
2012-04-02Mifare readonly support.Sunil Jogi7-22/+455
2012-04-02Patch to support MIFARE with SAK 0x01Sunil Jogi5-4/+9
2012-03-21Empty merge of a remote-tracking branchMike Lockwood0-0/+0
2012-03-21merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-20merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-20merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-16Don't dump nfc target/initiator modes to system log.Martijn Coenen1-2/+2
2012-03-12merge in jb-release history after reset to masterThe Android Automerger0-0/+0
2012-03-09Replace loge with aloge.Ramanan Rajeswaran1-1/+1
2012-03-09am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal1-5/+16
2012-03-09am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal1-5/+16