Gitiles
Code Review Sign In
gerrit.aospa.co / AOSPA / android_packages_apps_Nfc / HEAD
  1. 26563a6 Merge branch 'LA.BR.1.3.4_rb1.1' of git://codeaurora.org/platform/packages/apps/Nfc into marshmallow-caf by Jake Weinstein · 8 years ago marshmallow-caf
  2. b16594f Merge tag 'android-6.0.1_r3' into 601r3 by David Ng · 8 years ago
  3. a3728b8 Merge "Merge tag 'android-6.0.0_r26' into HEAD" by Linux Build Service Account · 8 years ago
  4. 5463ba2 Merge branch 'LA.HB.1.3.1_rb1.3' of git://codeaurora.org/platform/packages/apps/Nfc into marshmallow-caf by Jake Weinstein · 8 years ago
  5. 563baba Merge tag 'android-6.0.0_r26' into new by David Ng · 8 years ago
  6. 83e87b8 NFC: Adding new vendor specific interface to NFC Service by Puneet Mishra · 9 years ago
  7. 1c2c75d Merge tag 'android-6.0.0_r26' into HEAD by Divya Sharma · 9 years ago
  8. 6d55add Revert "Use global all-cpp-files-under" by Jake Weinstein · 9 years ago
  9. 8d04aee Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 am: 740e072600 am: 7390f09a40 by The Android Open Source Project · 9 years ago
  10. 0bc4de4 Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c am: 7aeb11db61 am: 1c27289895 by The Android Open Source Project · 9 years ago
  11. 755d0a2 Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 am: 740e072600 by The Android Open Source Project · 9 years ago
  12. 21ee8b2 Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c am: 7aeb11db61 by The Android Open Source Project · 9 years ago
  13. 7390f09 Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 by The Android Open Source Project · 9 years ago
  14. 1c27289 Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c by The Android Open Source Project · 9 years ago
  15. 740e072 Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 by The Android Open Source Project · 9 years ago
  16. 7aeb11d Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 by The Android Open Source Project · 9 years ago
  17. f96895a Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 by The Android Open Source Project · 9 years ago
  18. 3fdb2ab Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 by The Android Open Source Project · 9 years ago
  19. 63280fe Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a by The Android Open Source Project · 9 years ago
  20. 784ae49 Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 by The Android Open Source Project · 9 years ago
  21. 19108b5 Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev by The Android Open Source Project · 9 years ago
  22. 5be5775 Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d by The Android Open Source Project · 9 years ago
  23. e831499 Merge branch 'klp-modular-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev by The Android Open Source Project · 9 years ago
  24. 29c7538 Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 by The Android Open Source Project · 9 years ago
  25. 321347a Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 by The Android Open Source Project · 9 years ago
  26. 921fe1a Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f by The Android Open Source Project · 9 years ago
  27. 27602ce Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 by The Android Open Source Project · 9 years ago
  28. 80fa64f Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 by The Android Open Source Project · 9 years ago
  29. 38c77c1 Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f by The Android Open Source Project · 9 years ago
  30. a7d4ead Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f by The Android Open Source Project · 9 years ago
  31. 37d9ace Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 by The Android Open Source Project · 9 years ago
  32. 2481096 Reconcile with jb-mr0-release am: 29b858a5d6 by The Android Open Source Project · 9 years ago
  33. 4aa62e3 Merge "Don't enable reader mode when NFC is disabled." into mnc-dr-dev by Martijn Coenen · 9 years ago
  34. eee1696 Don't enable reader mode when NFC is disabled. by Martijn Coenen · 9 years ago
  35. 34a9f86 Revert "Stop building NXP stack." by Bruno Martins · 9 years ago
  36. e0744cf Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Nfc into nfc by Steve Kondik · 9 years ago
  37. e208aeb Use global all-cpp-files-under by Dan Willemsen · 9 years ago
  38. 03cb004 am affb020c: Merge "Use global all-cpp-files-under" by Dan Willemsen · 9 years ago
  39. affb020 Merge "Use global all-cpp-files-under" by Dan Willemsen · 9 years ago
  40. 080db1d Use global all-cpp-files-under by Dan Willemsen · 9 years ago
  41. b5dbc48 Import translations. DO NOT MERGE by Baligh Uddin · 9 years ago
  42. b382188 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  43. 30931b1 Import translations. DO NOT MERGE by Baligh Uddin · 9 years ago
  44. 21aadd1 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  45. 8415fed Grant WiFi override permission to NFC process. by Martijn Coenen · 9 years ago
  46. 7a79612 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  47. aa7adae Import translations. DO NOT MERGE by Baligh Uddin · 9 years ago
  48. 0386612 am a6986df8: Merge "Support Mifare Classic tag" by Martijn Coenen · 9 years ago
  49. a6986df Merge "Support Mifare Classic tag" by Martijn Coenen · 9 years ago
  50. 2f1e79e merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  51. 8605731 Support Mifare Classic tag. by Jizhou Liao · 9 years ago
  52. e8a1aa8 merge in mnc-release history after reset to mnc-dev by The Android Automerger · 9 years ago
  53. edc66ce merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  54. bfc30bb am ce14c7ae: Merge "Support Mifare DESFire tag format" by Martijn Coenen · 9 years ago
  55. ce14c7a Merge "Support Mifare DESFire tag format" by Martijn Coenen · 9 years ago
  56. 9f289d6 am 14687fef: Fix crash when invoking Beam with NFC off. by Martijn Coenen · 9 years ago
  57. 761e5bb am 14687fef: Fix crash when invoking Beam with NFC off. by Martijn Coenen · 9 years ago
  58. 14687fe Fix crash when invoking Beam with NFC off. by Martijn Coenen · 9 years ago
  59. fcf269b merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  60. c5eec3c Fix peer-to-peer server register error if RF discovery is started. by Jizhou Liao · 9 years ago
  61. fbbf113 Support Mifare DESFire tag format by Jizhou Liao · 9 years ago
  62. 4049181 Support Mifare Classic tag by Jizhou Liao · 9 years ago
  63. d8344b2 Support Mifare DESFire tag format by Jizhou Liao · 9 years ago
  64. e5a8d68 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  65. fb4e774 am 9acecdf4: Merge "Fix conflict vendor proprietary Protocol and Discovery technology definition" by Martijn Coenen · 9 years ago
  66. 9acecdf Merge "Fix conflict vendor proprietary Protocol and Discovery technology definition" by Martijn Coenen · 9 years ago
  67. 26e1bc7 Fix conflict vendor proprietary definitions. by Jizhou Liao · 9 years ago
  68. 3113a3f Fix conflict vendor proprietary Protocol and Discovery technology definition by Jizhou Liao · 9 years ago
  69. e84afe4 merge in mnc-release history after reset to mnc-dev by The Android Automerger · 9 years ago
  70. ffd7329 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  71. face8fb Reset P2P flag in de-initialization. by Jizhou Liao · 9 years ago
  72. b896d42 am 79458517: Fix NFC onManualBeamInvoke issue with policy by Alex Chau · 9 years ago
  73. e355dab am 79458517: Fix NFC onManualBeamInvoke issue with policy by Alex Chau · 9 years ago
  74. c20337c am 52b8b6ab: Merge "Fix peer-to-peer server register error if RF discovery is started." by Martijn Coenen · 9 years ago
  75. 52b8b6a Merge "Fix peer-to-peer server register error if RF discovery is started." by Martijn Coenen · 9 years ago
  76. c336a8c Merge "Reset P2P flag in de-initialization." into mnc-dr-dev by Martijn Coenen · 9 years ago
  77. 7945851 Fix NFC onManualBeamInvoke issue with policy by Alex Chau · 9 years ago
  78. ced053f Fix peer-to-peer server register error if RF discovery is started. by Jizhou Liao · 9 years ago
  79. 1348fbb am f0d90fa9: Merge "Reset P2P flag in de-initialization." by Martijn Coenen · 9 years ago
  80. f0d90fa Merge "Reset P2P flag in de-initialization." by Martijn Coenen · 9 years ago
  81. 2decd22 Reset P2P flag in de-initialization. by Jizhou Liao · 9 years ago
  82. f83884e merge in mnc-release history after reset to mnc-dev by The Android Automerger · 9 years ago
  83. 81cc1e0 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  84. d1618c0 am 0fdfe750: Use a foreground priority broadcast to hand over data to bluetooth. by Nicolas Prevot · 9 years ago
  85. 6282b57 am 0fdfe750: Use a foreground priority broadcast to hand over data to bluetooth. by Nicolas Prevot · 9 years ago
  86. 0fdfe75 Use a foreground priority broadcast to hand over data to bluetooth. by Nicolas Prevot · 9 years ago
  87. 892d81c merge in mnc-release history after reset to mnc-dev by The Android Automerger · 9 years ago
  88. d139be0 am b7a8d179: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  89. e326360 am b7a8d179: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  90. b7a8d17 Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  91. 3ce9cd8 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  92. 3c476db Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  93. 103c057 merge in mnc-dr-release history after reset to mnc-dr-dev by The Android Automerger · 9 years ago
  94. 2991f4c merge in mnc-release history after reset to mnc-dev by The Android Automerger · 9 years ago
  95. 5f1bdb4 am f4c79932: am a7f7ebfa: In BeamShareActivity, don\'t use UserHandle.CURRENT. by Nicolas Prevot · 9 years ago
  96. f4c7993 am a7f7ebfa: In BeamShareActivity, don\'t use UserHandle.CURRENT. by Nicolas Prevot · 9 years ago
  97. 37199ec Reset P2P flag in de-initialization. by Jizhou Liao · 9 years ago
  98. a7f7ebf In BeamShareActivity, don't use UserHandle.CURRENT. by Nicolas Prevot · 9 years ago
  99. aae8e7c merge in mnc-release history after reset to mnc-dev by The Android Automerger · 9 years ago
  100. 80d190e am f54dcfaa: am a772e9a8: New permission in Nfc stack to allow client validation. by Rubin Xu · 9 years ago