Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / packages / apps / Nfc / refs/heads/fp2-sibon
  1. d15b13e FPII-2054: Verify setForegroundDispatch caller is in foreground. by Martijn Coenen · 8 years ago fp2-sibon FP2-open-16.07.1 FP2-open-16.08.0 FP2-open-16.09.0 FP2-open-16.10.0 FP2-open-16.11.0 FP2-open-16.12.0 FP2-open-17.01.0 FP2-open-17.04.0
  2. 1ea130e Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE by Shreyas Narayan · 9 years ago fp2-sibon-2.0.1 fp2-sibon-2.0.2 FP2-open-16.05.0 FP2-open-16.06.0
  3. 15d2dfc Re-add quotes for network key and ssid by Andres Morales · 9 years ago
  4. 15c963a Material Beam icon. by Martijn Coenen · 9 years ago
  5. afc67ea Merge "Only set WPA_PSK for WPA_PSK and WPA2_PSK" into lmp-mr1-dev by Andres Morales · 9 years ago
  6. ff18065 Only set WPA_PSK for WPA_PSK and WPA2_PSK by Andres Morales · 9 years ago
  7. 60671e3 Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  8. ac28fac Merge "Remove asterisk from AID when removing prefix entries" into lmp-mr1-dev by Andres Morales · 9 years ago
  9. c5d3a21 Remove asterisk from AID when removing prefix entries by Paul Chaisson · 9 years ago
  10. 02f9be4 Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  11. f96571b Merge "Remove B' polling for B tags" into lmp-mr1-dev by Andres Morales · 9 years ago
  12. c712fc9 Merge "Fix crash in ReaderMode API for Nakasi" into lmp-mr1-dev by Andres Morales · 9 years ago
  13. 616980f Remove B' polling for B tags by Andres Morales · 9 years ago
  14. 2df42ee Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev by Geoff Mendal · 9 years ago
  15. 767ef8f Fix crash in ReaderMode API for Nakasi by Andres Morales · 9 years ago
  16. e6b10cf Fix issue where Beam is disabled in SW by Andres Morales · 9 years ago
  17. cb5f252 Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  18. 95302c1 Read UserHandle from passed in ShareData by Andres Morales · 9 years ago
  19. 4db91a1 Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  20. 7ce7192 Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  21. 4f146f3 Merge "Fix NfcDiscoveryParameters" into lmp-mr1-dev by Andres Morales · 9 years ago
  22. 06c7bbe Fix NfcDiscoveryParameters by Andres Morales · 9 years ago
  23. 8aef6f7 Import translations. DO NOT MERGE by Geoff Mendal · 9 years ago
  24. 8a80bc7 Merge "Prevent Beam at the lockscreen and during provisioning" into lmp-mr1-dev by Andres Morales · 10 years ago
  25. 14ca226 Merge "Add verifyNfcPermission()." into lmp-mr1-dev by Martijn Coenen · 10 years ago
  26. 3349df3 Merge "Add toast to tell the user Beam is busy" into lmp-mr1-dev by Andres Morales · 10 years ago
  27. 31b0f46 Prevent Beam at the lockscreen and during provisioning by Andres Morales · 10 years ago
  28. ae4ceda Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  29. d5c1305 Merge "Restrict RF Field events to preferred app." into lmp-mr1-dev by Martijn Coenen · 10 years ago
  30. aaca835 Add toast to tell the user Beam is busy by Andres Morales · 10 years ago
  31. eadc627 Merge "Make BT pairing strings localizable" into lmp-mr1-dev by Andres Morales · 10 years ago
  32. 2ca2ced Merge "Refactor Beam to work with managed profiles" into lmp-mr1-dev by Andres Morales · 10 years ago
  33. 5d0258c Add verifyNfcPermission(). by Martijn Coenen · 10 years ago
  34. dceae91 Make BT pairing strings localizable by Andres Morales · 10 years ago
  35. b82d80d Refactor Beam to work with managed profiles by Andres Morales · 10 years ago
  36. d943597 Restrict RF Field events to preferred app. by Martijn Coenen · 10 years ago
  37. 8172b1e Parse auth type from WPS tag by Andres Morales · 10 years ago
  38. eebaf6f Merge "Deactivate Beam when DISALLOW_OUTGOING_BEAM is set." into lmp-mr1-dev by Benjamin Franz · 10 years ago
  39. 0375411 Merge "Reactivate Beam sharing for managed profiles." into lmp-mr1-dev by Benjamin Franz · 10 years ago
  40. b708f80 Deactivate Beam when DISALLOW_OUTGOING_BEAM is set. by Benjamin Franz · 10 years ago
  41. 2488110 merge in lmp-release history after reset to 5443a8f5b786bfc03633ea5821d95dffc856e3e8 by The Android Automerger · 10 years ago
  42. 93c7f66 merge in lmp-release history after reset to 5443a8f5b786bfc03633ea5821d95dffc856e3e8 by The Android Automerger · 10 years ago
  43. 6ad3ce2 am 6fda4eba: am 5443a8f5: Don\'t scale Beam screenshot. by Martijn Coenen · 10 years ago
  44. 6fda4eb am 5443a8f5: Don\'t scale Beam screenshot. by Martijn Coenen · 10 years ago
  45. 5443a8f Don't scale Beam screenshot. by Martijn Coenen · 10 years ago
  46. 505bb73 am 0cee34f9: (-s ours) am 4a20d330: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  47. 0cee34f am 4a20d330: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  48. 4a20d33 Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  49. e0c62b2 merge in lmp-release history after reset to 672cb7036e219e260ba97f025c70e59728e261d6 by The Android Automerger · 10 years ago
  50. 4210262 Merge "Set BT device alias from NFC tag" into lmp-mr1-dev by Andres Morales · 10 years ago
  51. 5937589 merge in lmp-release history after reset to 672cb7036e219e260ba97f025c70e59728e261d6 by The Android Automerger · 10 years ago
  52. 65860bb Reactivate Beam sharing for managed profiles. by Benjamin Franz · 10 years ago
  53. 557a483 merge in lmp-release history after reset to 672cb7036e219e260ba97f025c70e59728e261d6 by The Android Automerger · 10 years ago
  54. 1d9aa6f am 60740802: am 672cb703: Merge "Changes for Beam memory" into lmp-dev by Andres Morales · 10 years ago
  55. c12fd62 am 89bb5a9e: am 7130de73: Merge "Revert "Do Beam UI outside NFC persistent process"" into lmp-dev by Andres Morales · 10 years ago
  56. 6074080 am 672cb703: Merge "Changes for Beam memory" into lmp-dev by Andres Morales · 10 years ago
  57. 89bb5a9 am 7130de73: Merge "Revert "Do Beam UI outside NFC persistent process"" into lmp-dev by Andres Morales · 10 years ago
  58. 672cb70 Merge "Changes for Beam memory" into lmp-dev by Andres Morales · 10 years ago
  59. 7130de7 Merge "Revert "Do Beam UI outside NFC persistent process"" into lmp-dev by Andres Morales · 10 years ago
  60. 0e94438 Changes for Beam memory by Andres Morales · 10 years ago
  61. 65ba8d0 Revert "Do Beam UI outside NFC persistent process" by Andres Morales · 10 years ago
  62. 3212e8c merge in lmp-release history after reset to b58a7494a893c957a8c04397eb28a4bf2fe1db54 by The Android Automerger · 10 years ago
  63. 695df77 merge in lmp-release history after reset to b58a7494a893c957a8c04397eb28a4bf2fe1db54 by The Android Automerger · 10 years ago
  64. 417c6b2 merge in lmp-release history after reset to b58a7494a893c957a8c04397eb28a4bf2fe1db54 by The Android Automerger · 10 years ago
  65. 602ec62 Disable service cache debug. by Martijn Coenen · 10 years ago
  66. f652524 am 38445c6a: am b58a7494: Disable service cache debug. by Martijn Coenen · 10 years ago
  67. 38445c6 am b58a7494: Disable service cache debug. by Martijn Coenen · 10 years ago
  68. b58a749 Disable service cache debug. by Martijn Coenen · 10 years ago
  69. 5c4d0fe merge in lmp-release history after reset to 1ed9fb37431002d39d9e34c6a73b3d0397827ef5 by The Android Automerger · 10 years ago
  70. e86bb9c am ebcaa8f7: am 1ed9fb37: Disable polling after KB pairing debounce timeout by Andres Morales · 10 years ago
  71. ebcaa8f am 1ed9fb37: Disable polling after KB pairing debounce timeout by Andres Morales · 10 years ago
  72. 1ed9fb3 Disable polling after KB pairing debounce timeout by Andres Morales · 10 years ago
  73. eef9897 merge in lmp-release history after reset to d010a97424d26b759bfdea1f54d3896408798abb by The Android Automerger · 10 years ago
  74. 693a22d merge in lmp-release history after reset to d010a97424d26b759bfdea1f54d3896408798abb by The Android Automerger · 10 years ago
  75. 1657bed am 4eb0bc46: am d010a974: Merge "Remove dead code from NfcDispatcher" into lmp-dev by Andres Morales · 10 years ago
  76. 4eb0bc4 am d010a974: Merge "Remove dead code from NfcDispatcher" into lmp-dev by Andres Morales · 10 years ago
  77. d010a97 Merge "Remove dead code from NfcDispatcher" into lmp-dev by Andres Morales · 10 years ago
  78. c54a22d Remove dead code from NfcDispatcher by Andres Morales · 10 years ago
  79. db02659 am daf29803: am 91731893: Fix issue #17752399: Multiple apps broken by GET_TASKS permission change by Dianne Hackborn · 10 years ago
  80. daf2980 am 91731893: Fix issue #17752399: Multiple apps broken by GET_TASKS permission change by Dianne Hackborn · 10 years ago
  81. 3a8a367 merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a448fd23a by The Android Automerger · 10 years ago
  82. 52362c9 merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a448fd23a by The Android Automerger · 10 years ago
  83. 9173189 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change by Dianne Hackborn · 10 years ago
  84. c6204dc Set BT device alias from NFC tag by Andres Morales · 10 years ago
  85. 701549c merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a448fd23a by The Android Automerger · 10 years ago
  86. 1745ca8 merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a448fd23a by The Android Automerger · 10 years ago
  87. fb890c0 am c1e5e1fd: (-s ours) am 906c1c6e: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  88. c1e5e1f am 906c1c6e: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  89. fa151cb merge in lmp-release history after reset to 2e1b401f763d13b81f9a31e036706c6b54761026 by The Android Automerger · 10 years ago
  90. 906c1c6 Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  91. 989085f merge in lmp-release history after reset to 2e1b401f763d13b81f9a31e036706c6b54761026 by The Android Automerger · 10 years ago
  92. 0813c35 am 187e0ea9: am 2e1b401f: Merge "Fix bugs in AID prefix conflict resolution." into lmp-dev by Martijn Coenen · 10 years ago
  93. 187e0ea am 2e1b401f: Merge "Fix bugs in AID prefix conflict resolution." into lmp-dev by Martijn Coenen · 10 years ago
  94. 2e1b401 Merge "Fix bugs in AID prefix conflict resolution." into lmp-dev by Martijn Coenen · 10 years ago
  95. 0ad654d Fix bugs in AID prefix conflict resolution. by Martijn Coenen · 10 years ago
  96. 12f5d2f am e0ffd725: am 00a2b5eb: Merge "Catch any exception from remote in unlock handler" into lmp-dev by Andres Morales · 10 years ago
  97. d2b4676 am 2677463a: am 3b6797c0: Change polling timeout to 35s from 20s by Andres Morales · 10 years ago
  98. e0ffd72 am 00a2b5eb: Merge "Catch any exception from remote in unlock handler" into lmp-dev by Andres Morales · 10 years ago
  99. 2677463 am 3b6797c0: Change polling timeout to 35s from 20s by Andres Morales · 10 years ago
  100. 00a2b5e Merge "Catch any exception from remote in unlock handler" into lmp-dev by Andres Morales · 10 years ago