Google Git
Sign in
android / platform / packages / apps / Nfc / HEAD
  1. 7c08bb1 Skip 25Q1 (ab/BP1A.250305.020) in aosp-main-future by Xin Li · 6 months ago main master
  2. 93ec08c Skip 25Q1 (ab/12770256) in aosp-main-future by Xin Li · 7 months ago
  3. b6d09fc Merge cherrypicks of ['googleplex-android-review.googlesource.com/31390682'] into 25Q1-release. by Android Build Coastguard Worker · 7 months ago android15-qpr2-release android15-qpr2-s1-release android15-qpr2-s10-release android15-qpr2-s2-release android15-qpr2-s3-release android15-qpr2-s4-release android15-qpr2-s5-release android15-qpr2-s6-release android15-qpr2-s7-release android15-qpr2-s8-release android15-qpr2-s9-release android-15.0.0_r20 android-15.0.0_r21 android-15.0.0_r22 android-15.0.0_r23 android-15.0.0_r26 android-15.0.0_r27 android-15.0.0_r28 android-15.0.0_r29 android-15.0.0_r30 android-15.0.0_r32 android-15.0.0_r33 android-15.0.0_r34 android-15.0.0_r35 android-15.0.0_r36
  4. f4f511c Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 7 months ago
  5. ffb5330 Merge cherrypicks of ['googleplex-android-review.googlesource.com/31192861', 'googleplex-android-review.googlesource.com/31192862', 'googleplex-android-review.googlesource.com/31192863'] into 25Q1-release. by Android Build Coastguard Worker · 8 months ago
  6. 527f435 Track HCE payment service connection events in NFC log by Roshan Pius · 8 months ago
  7. bb18046 nfc: Rebind Payment Service if polling frames are dropped by Roshan Pius · 8 months ago
  8. 0d9f486 Rebind Payment service when the service binder isn't responding by Roshan Pius · 8 months ago
  9. 7f77979 Merge cherrypicks of ['android-review.googlesource.com/3405819'] into 25Q1-release. by Android Build Coastguard Worker · 8 months ago
  10. 305df5a In doDisconnect, deactivate even if the tag is in sleep state. by Arach MOHAMMED BRAHIM · 8 months ago
  11. ad71b5d [automerger skipped] Merge "nfc(apps): Move NFC codebase to packages/modules/Nfc" into main am: 1ff8ab5e8e -s ours by Treehugger Robot · 8 months ago
  12. cc41cad [automerger skipped] nfc(apps): Move NFC codebase to packages/modules/Nfc am: 59969ef5c4 -s ours by My Name · 8 months ago
  13. 1ff8ab5 Merge "nfc(apps): Move NFC codebase to packages/modules/Nfc" into main by Treehugger Robot · 8 months ago
  14. cc2c2f9 nfc(apps): Move NFC codebase to packages/modules/Nfc by My Name · 8 months ago
  15. 59969ef nfc(apps): Move NFC codebase to packages/modules/Nfc by My Name · 8 months ago
  16. 943aabe Merge changes from topic "rf_removal_detection" into main am: 685b83d4ca by Treehugger Robot · 8 months ago
  17. 849b607 Added improvements in tag removal detection am: 7dc5903d96 by suryaprakash.konduru · 8 months ago
  18. ba49fe5 nfc: add a flag for removal detection am: c41f923441 by Wei-Hong Hsu · 8 months ago
  19. d138f28 RF Removal Detection support am: f65fab4562 by Arach MOHAMMED BRAHIM · 8 months ago
  20. 685b83d Merge changes from topic "rf_removal_detection" into main by Treehugger Robot · 8 months ago
  21. 244da10 Force tag connection if framework command by Alexandra Ducati-Manas · 8 months ago
  22. 7dc5903 Added improvements in tag removal detection by suryaprakash.konduru · 8 months ago
  23. 3220bf7 Merge changes Ic4ddb068,I46d551d0,I8d6f39b1 into main am: 7321962ef0 by Roshan Pius · 8 months ago
  24. de970d7 Merge "Rename onRfFieldActivated to onRfFieldDetected per API review" into main am: 89dbbb8e37 by Treehugger Robot · 8 months ago
  25. 7321962 Merge changes Ic4ddb068,I46d551d0,I8d6f39b1 into main by Roshan Pius · 8 months ago
  26. 89dbbb8 Merge "Rename onRfFieldActivated to onRfFieldDetected per API review" into main by Treehugger Robot · 8 months ago
  27. cceb2e4 Update AidRoutingManagerTest by George Chang · 8 months ago
  28. 5b80caa RoutingManager.cpp code optimisation: use updateRoutingTable() at start by Alexandra Ducati-Manas · 8 months ago
  29. 6ec2845 Using clearRoutingTable() to remove AIDs from routing table by Alexandra Ducati-Manas · 8 months ago
  30. 8bacdfc Merge "[nfc] the initSoundPoolIfNeededAndPlaySound() method is protected by the "this" lock in the playSound() method and does not require nested locks" into main am: db77723a1c by Treehugger Robot · 8 months ago
  31. db77723 Merge "[nfc] the initSoundPoolIfNeededAndPlaySound() method is protected by the "this" lock in the playSound() method and does not require nested locks" into main by Treehugger Robot · 8 months ago
  32. c41f923 nfc: add a flag for removal detection by Wei-Hong Hsu · 8 months ago
  33. f65fab4 RF Removal Detection support by Arach MOHAMMED BRAHIM · 8 months ago
  34. 8fd1eb6 [nfc] the initSoundPoolIfNeededAndPlaySound() method is protected by the "this" lock in the playSound() method and does not require nested locks by fucheng lu · 8 months ago
  35. e73491e Merge "implementation of eUICC" into main am: 5e3c9ae253 by Bob Wang · 8 months ago
  36. 5e3c9ae Merge "implementation of eUICC" into main by Bob Wang · 8 months ago
  37. 2e772b5 Merge "Only synchronize on NfcService and not NfcAdapterService for vendor specfic commands to avoid deadlocks." into main am: 72883fa7a2 by Treehugger Robot · 8 months ago
  38. feedf19 Rename onRfFieldActivated to onRfFieldDetected per API review by Alisher Alikhodjaev · 8 months ago
  39. 72883fa Merge "Only synchronize on NfcService and not NfcAdapterService for vendor specfic commands to avoid deadlocks." into main by Treehugger Robot · 8 months ago
  40. 0614dc6 implementation of eUICC by jhh.seo · 8 months ago
  41. 8f15e80 Only synchronize on NfcService and not NfcAdapterService for vendor by Brad Lassey · 8 months ago
  42. a460940 Merge "Fix for multiple ISO-DEP entries in routing table." into main am: e594ded1b6 by Roshan Pius · 8 months ago
  43. e594ded Merge "Fix for multiple ISO-DEP entries in routing table." into main by Roshan Pius · 8 months ago
  44. dc0f79d Merge "Force routing table update when enabling nfc" into main am: 5f5c5039bd by Treehugger Robot · 8 months ago
  45. 5f5c503 Merge "Force routing table update when enabling nfc" into main by Treehugger Robot · 8 months ago
  46. 0a8708c Force routing table update when enabling nfc by Jack Yu · 8 months ago
  47. 5226ee7 Merge "Added headers for functions in RoutingManager.cpp" into main am: d571e68eb5 by Treehugger Robot · 8 months ago
  48. d571e68 Merge "Added headers for functions in RoutingManager.cpp" into main by Treehugger Robot · 8 months ago
  49. b0eb311 Merge "Only synchronize on NfcService and not NfcAdapterService to avoid deadlocks." into main am: 3c0c5ff159 by Treehugger Robot · 8 months ago
  50. 3c0c5ff Merge "Only synchronize on NfcService and not NfcAdapterService to avoid deadlocks." into main by Treehugger Robot · 8 months ago
  51. c626411 Only synchronize on NfcService and not NfcAdapterService to avoid deadlocks. by Brad Lassey · 8 months ago
  52. 354b1c7 Added headers for functions in RoutingManager.cpp by Alexandra Ducati-Manas · 8 months ago
  53. e93eb3f Merge "Update NfcTagAllowNotification strings and layout" into main am: 56f5dd41e7 by George Chang · 8 months ago
  54. 56f5dd4 Merge "Update NfcTagAllowNotification strings and layout" into main by George Chang · 8 months ago
  55. eda72db Merge "Updating clearRoutingEntry() to use NFA_EeClearRoutingTable() API" into main am: 5283ccf534 by Treehugger Robot · 8 months ago
  56. 27c29ab Update NfcTagAllowNotification strings and layout by George Chang · 8 months ago
  57. 5283ccf Merge "Updating clearRoutingEntry() to use NFA_EeClearRoutingTable() API" into main by Treehugger Robot · 8 months ago
  58. cf828d7 Fix for multiple ISO-DEP entries in routing table. by sai.shwethas · 8 months ago
  59. 2de5560 Updating clearRoutingEntry() to use NFA_EeClearRoutingTable() API by Alexandra Ducati-Manas · 8 months ago
  60. 3ff356b Merge changes I688af1ff,If1f2e1a1 into main am: f437925d99 by George Chang · 8 months ago
  61. f437925 Merge changes I688af1ff,If1f2e1a1 into main by George Chang · 8 months ago
  62. 32e79a8 Override tag intent preference settings if blocklist changed by George Chang · 8 months ago
  63. 089d927 [automerger skipped] Merge "Revert "nfc: Fix build failure"" into main am: c02a4c00dc -s ours by Treehugger Robot · 8 months ago
  64. 18e5389 [automerger skipped] Revert "nfc: Fix build failure" am: 8f2d217508 -s ours by Roshan Pius · 8 months ago
  65. c02a4c0 Merge "Revert "nfc: Fix build failure"" into main by Treehugger Robot · 8 months ago
  66. 8f2d217 Revert "nfc: Fix build failure" by Roshan Pius · 8 months ago
  67. 8bf586d Merge "Revert "nfc: Fix build failure"" into aosp-main-future by Roshan Pius · 9 months ago
  68. c0d8e5b Merge "[NfcApp] NDEF-NFCEE AID registration." into main am: 901b8a03d5 by Treehugger Robot · 9 months ago
  69. 901b8a0 Merge "[NfcApp] NDEF-NFCEE AID registration." into main by Treehugger Robot · 9 months ago
  70. c9df387 Merge "[bug fix] Update user change restriction every time before return." into main am: 3c99afeefc by Treehugger Robot · 9 months ago
  71. 3c99afe Merge "[bug fix] Update user change restriction every time before return." into main by Treehugger Robot · 9 months ago
  72. d15c00a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 9a7b25b2d5 -s ours by Treehugger Robot · 9 months ago
  73. 6778569 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bef2797784 -s ours by Bill Yi · 9 months ago
  74. 555b8b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 2d076bff14 -s ours by Treehugger Robot · 9 months ago
  75. 9f41f8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f293de65ae -s ours by Bill Yi · 9 months ago
  76. e19a666 Merge "Revert "Revert "nfc(app): Split non-updatable portion to a separ..."" into main am: f279e2deef by Roshan Pius · 9 months ago
  77. 9a7b25b Merge "Import translations. DO NOT MERGE ANYWHERE" into main by Treehugger Robot · 9 months ago
  78. 2d076bf Merge "Import translations. DO NOT MERGE ANYWHERE" into main by Treehugger Robot · 9 months ago
  79. 3536d06 [bug fix] Update user change restriction every time before return. by ziyiw · 9 months ago
  80. f279e2d Merge "Revert "Revert "nfc(app): Split non-updatable portion to a separ..."" into main by Roshan Pius · 9 months ago
  81. f293de6 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 9 months ago
  82. bef2797 Import translations. DO NOT MERGE ANYWHERE by Bill Yi · 9 months ago
  83. 5b08bad Default disallow android tag app by George Chang · 9 months ago
  84. 4c209bf Merge "Propagate error information when routing table commit fails" into main am: 7c40e67916 by Bob Wang · 9 months ago
  85. fd6b584 Merge "Adjust to API changes in ApduServiceInfo for shared role priority" into main am: ee010abb53 by Treehugger Robot · 9 months ago
  86. 7c40e67 Merge "Propagate error information when routing table commit fails" into main by Bob Wang · 9 months ago
  87. 1b80eb3 [automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 5d95b8a6a5 -s ours by Xin Li · 9 months ago
  88. fded0ab [automerger skipped] Merge 24Q4 into AOSP main am: 265ba03e3f -s ours by Xin Li · 9 months ago
  89. 1149aff Revert "Revert "nfc(app): Split non-updatable portion to a separ..." by Roshan Pius · 9 months ago
  90. ee010ab Merge "Adjust to API changes in ApduServiceInfo for shared role priority" into main by Treehugger Robot · 9 months ago
  91. 5d95b8a Merge "Merge 24Q4 into AOSP main" into main by Xin Li · 9 months ago
  92. 56a77e4 Merge "nfc: Prepare for NFC codebase move" into main am: 5545899aaf by Roshan Pius · 9 months ago
  93. 5545899 Merge "nfc: Prepare for NFC codebase move" into main by Roshan Pius · 9 months ago
  94. f8e4824 Merge "Revert "nfc(app): Split non-updatable portion to a separate folder"" into main am: 90ac5d8510 by Roshan Pius · 9 months ago
  95. e4467c9 Merge "nfc(app): Split non-updatable portion to a separate folder" into main am: 9334a1e70f by Treehugger Robot · 9 months ago
  96. 53318aa Propagate error information when routing table commit fails by Roshan Pius · 9 months ago
  97. 90ac5d8 Merge "Revert "nfc(app): Split non-updatable portion to a separate folder"" into main by Roshan Pius · 9 months ago
  98. 19ba881 Revert "nfc(app): Split non-updatable portion to a separate folder" by Roshan Pius · 9 months ago
  99. 723852c nfc: Prepare for NFC codebase move by Roshan Pius · 9 months ago
  100. c1d4e3e Merge "Bypass the setDiscoveryTech override for setReaderMode API" into main am: d8a38ee52a by Treehugger Robot · 9 months ago