Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / vendor / nxp / opensource / packages / apps / Nfc / 4ba001b980a34af573be95c026ba1a114c5b59f0
  1. 4ba001b Import translations. DO NOT MERGE by Eric Fischer · 13 years ago
  2. 391cfe2 Rewrite NDEF dispatch path. It was getting pretty messy. by Nick Pelly · 13 years ago
  3. 1a037ff Merge "Bring LLCP connectionless sockets back to life." by Martijn Coenen · 13 years ago
  4. e008eba Bring LLCP connectionless sockets back to life. by Martijn Coenen · 13 years ago
  5. 0d23ad0 Merge "Make airplane override for NFC persistent." by Martijn Coenen · 13 years ago
  6. 1668f53 Make airplane override for NFC persistent. by Martijn Coenen · 13 years ago
  7. afc8705 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 13 years ago
  8. 15be799 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 13 years ago
  9. 128f32b Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE by Steve Block · 13 years ago
  10. 7d4e962 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE by Steve Block · 13 years ago
  11. 9bfa3a3 Import revised translations. by Eric Fischer · 13 years ago
  12. 86987aa Merge "Always search for p2p target in discovery list." by Martijn Coenen · 13 years ago
  13. 53b56cb Always search for p2p target in discovery list. by Martijn Coenen · 13 years ago
  14. fd2cdbf Nfc: s/NFC JNI/NFCJNI/ in jni log tag. by mike wakerly · 13 years ago
  15. c9342fe NfcService: some trivial cleanups. by mike wakerly · 13 years ago
  16. 47791cf LOG -> ALOG by Nick Pelly · 13 years ago
  17. b5a1f0f am 7948ab63: Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  18. 7948ab6 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  19. 3957268 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  20. 63a5c36 am 985dcef8: Fix Beam&Tag failures after opening NFC-EE. by Nick Pelly · 13 years ago
  21. 985dcef Fix Beam&Tag failures after opening NFC-EE. by Nick Pelly · 13 years ago
  22. e64c652 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  23. 3a8843a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  24. 4df60d8 am 16ac4580: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  25. 16ac458 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  26. eafd2ed Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  27. 3f3cc18 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  28. a76d8ec resolved conflicts for merge of 92250f5c to master by Nick Pelly · 13 years ago
  29. 92250f5 Fix mismatched link()/unlink() causing NFC-EE to be stuck open. by Nick Pelly · 13 years ago
  30. ebbf54b Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  31. e95ef63 am 951dad2b: Restore deleted string still referenced from manifest. by Eric Fischer · 13 years ago
  32. 25e0d39 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  33. 951dad2 Restore deleted string still referenced from manifest. by Eric Fischer · 13 years ago
  34. 1fc599b merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  35. b2c4b38 Merge "Import revised translations." by Eric Fischer · 13 years ago
  36. e2cccc0 Import revised translations. by Eric Fischer · 13 years ago
  37. 2a3f6f1 Fix two incorrect synchronized statements. by mike wakerly · 13 years ago
  38. a29693d am 3a675100: Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1 by Martijn Coenen · 13 years ago
  39. 3a67510 Merge "Fix NdefFormatable not showing up for NfcA technologies." into ics-mr1 by Martijn Coenen · 13 years ago
  40. 5eadae2 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  41. 841409b Fix NdefFormatable not showing up for NfcA technologies. by Martijn Coenen · 13 years ago
  42. b65d7ea Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  43. ad62867 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  44. 772130a am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 by Nick Pelly · 13 years ago
  45. e1cadb0 Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 by Nick Pelly · 13 years ago
  46. 37bb7b2 Replace vendor specific NfcGoogle.apk with generic Nfc.apk by Nick Pelly · 13 years ago
  47. ac9b34c Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  48. c171c42 am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1 by Martijn Coenen · 13 years ago
  49. 61b4532 am 078e8368: Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1 by Nick Pelly · 13 years ago
  50. 806a782 Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1 by Martijn Coenen · 13 years ago
  51. 483f306 Also send NFCEE broadcasts to dynamically registered receivers. by Martijn Coenen · 13 years ago
  52. 078e836 Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1 by Nick Pelly · 13 years ago
  53. 23136ec merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  54. fba7c35 am bc6535cc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  55. 602f9b6 am 59137f77: No-op merge from ics-mr0 by The Android Open Source Project · 13 years ago
  56. 4d80c35 Set up DISCOVERY and SE notification callbacks at NFC init. by Nick Pelly · 13 years ago
  57. bc6535c Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  58. e6178c2 Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  59. 59137f7 No-op merge from ics-mr0 by The Android Open Source Project · 13 years ago
  60. 5c12d70 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 13 years ago
  61. 2a7163a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  62. b5ca7e7 am 2b093e93: Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1 by Nick Pelly · 13 years ago
  63. 2b093e9 Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1 by Nick Pelly · 13 years ago
  64. fc87b42 Enable NFC-EE immediately when screen is on but locked. by mike wakerly · 13 years ago
  65. 574f278 am f4226b69: Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1 by Nick Pelly · 13 years ago
  66. 905cf88 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  67. f4226b6 Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1 by Nick Pelly · 13 years ago
  68. 0571ce5 Add null check to aovid NPE on un-matched close(). by Nick Pelly · 13 years ago
  69. 68dfe2c merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  70. 0d00a83 resolved conflicts for merge of ebf4b36e to master by Nick Pelly · 13 years ago
  71. 1d9c95c am d9203771: Optimize soundpool use. by Martijn Coenen · 13 years ago
  72. ebf4b36 Merge "Implement static white-list access control for NFC-EE." into ics-mr1 by Nick Pelly · 13 years ago
  73. d920377 Optimize soundpool use. by Martijn Coenen · 13 years ago
  74. b0928ea Allow EEPROM settings override using properties. by Martijn Coenen · 13 years ago
  75. c05387e Implement static white-list access control for NFC-EE. by Jeff Hamilton · 13 years ago
  76. 07cb451 Merge "Import revised translations." by Eric Fischer · 13 years ago
  77. 0c14e3f Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  78. 4d4713b Import revised translations. by Eric Fischer · 13 years ago
  79. a0e2279 am 133d5fee: (-s ours) am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  80. 1027822 am c1c09483: Reduce sound assets size. by Eric Laurent · 13 years ago
  81. 133d5fe am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  82. 6d470b8 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  83. 88194cf Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  84. c1c0948 Reduce sound assets size. by Eric Laurent · 13 years ago
  85. 81d5e01 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  86. 9408fa0 am d7bca9eb: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  87. d7bca9e Merge "Import revised translations. DO NOT MERGE" into ics-mr1 by Eric Fischer · 13 years ago
  88. 086971d Import revised translations. DO NOT MERGE by Eric Fischer · 13 years ago
  89. b28f540 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago
  90. de189bb am cbc85676: Merge "Get EEPROM settings from NFC HAL." into ics-mr1 by Martijn Coenen · 13 years ago
  91. c9a17f6 am f7a151e2: Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1 by Martijn Coenen · 13 years ago
  92. cbc8567 Merge "Get EEPROM settings from NFC HAL." into ics-mr1 by Martijn Coenen · 13 years ago
  93. f7a151e Merge "Remove static background image from Beam when no hw-acceleration." into ics-mr1 by Martijn Coenen · 13 years ago
  94. 7ba4a8a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 13 years ago
  95. 5c5ecd9 am a2181682: Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1 by Martijn Coenen · 13 years ago
  96. 9390cc0 am 304a7304: Merge "Don\'t finish Beam animation again." into ics-mr1 by Martijn Coenen · 13 years ago
  97. a218168 Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1 by Martijn Coenen · 13 years ago
  98. 304a730 Merge "Don't finish Beam animation again." into ics-mr1 by Martijn Coenen · 13 years ago
  99. c7f74df Get EEPROM settings from NFC HAL. by Martijn Coenen · 13 years ago
  100. 967f455 Reconcile with ics-mr1-release by The Android Open Source Project · 13 years ago