Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / native / 123edd9f812c93973de923397f2a5cb6fdaa4135
  1. 123edd9 resolved conflicts for merge of 04e13acd to master by Christopher Ferris · 9 years ago
  2. 04e13ac am 69a141e0: am 9d68ed0e: Merge "Add timeout for dump_file." by Christopher Ferris · 9 years ago
  3. 69a141e am 9d68ed0e: Merge "Add timeout for dump_file." by Christopher Ferris · 9 years ago
  4. 9d68ed0 Merge "Add timeout for dump_file." by Christopher Ferris · 9 years ago
  5. 59b0b56 resolved conflicts for merge of d6c8ae9c to master by Mark Salyzyn · 9 years ago
  6. d6c8ae9 am 2f655dae: am bb67beca: Merge "dumpstate: add pstore read" by Mark Salyzyn · 9 years ago
  7. 2f655da am bb67beca: Merge "dumpstate: add pstore read" by Mark Salyzyn · 9 years ago
  8. bb67bec Merge "dumpstate: add pstore read" by Mark Salyzyn · 9 years ago
  9. 2262c16 dumpstate: add pstore read by Mark Salyzyn · 10 years ago
  10. 54bcc5f Add timeout for dump_file. by Christopher Ferris · 9 years ago
  11. 53ec1f0 am beb89e11: am 6f57b269: am 56f8c6c4: Merge "Error compiling waitforvsync.cpp" by Greg Hackmann · 9 years ago
  12. beb89e1 am 6f57b269: am 56f8c6c4: Merge "Error compiling waitforvsync.cpp" by Greg Hackmann · 9 years ago
  13. 6f57b26 am 56f8c6c4: Merge "Error compiling waitforvsync.cpp" by Greg Hackmann · 9 years ago
  14. 56f8c6c Merge "Error compiling waitforvsync.cpp" by Greg Hackmann · 9 years ago
  15. 1d41e34 am 52a442d2: am 8d319341: am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings." by Dan Albert · 9 years ago
  16. 52a442d am 8d319341: am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings." by Dan Albert · 9 years ago
  17. 8d31934 am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings." by Dan Albert · 9 years ago
  18. 7974984 Merge "Fix pointer-to-int and int-to-pointer warnings." by Dan Albert · 9 years ago
  19. ca87072 Merge "Remove eng tag from input tests." by Michael Wright · 9 years ago
  20. eb4ed3e Remove eng tag from input tests. by Michael Wright · 9 years ago
  21. 857a35d Merge "Move inputflinger process to host directory" by Michael Wright · 9 years ago
  22. 6f78360 Move inputflinger process to host directory by Michael Wright · 9 years ago
  23. ad0f52f Fix pointer-to-int and int-to-pointer warnings. by Dan Albert · 9 years ago
  24. 129da2b am 453c6a78: am a455ec21: am d80268ba: Merge "vsync.cpp test is throwing error whe compiled" by Mark Salyzyn · 9 years ago
  25. 453c6a7 am a455ec21: am d80268ba: Merge "vsync.cpp test is throwing error whe compiled" by Mark Salyzyn · 9 years ago
  26. a455ec2 am d80268ba: Merge "vsync.cpp test is throwing error whe compiled" by Mark Salyzyn · 9 years ago
  27. d80268b Merge "vsync.cpp test is throwing error whe compiled" by Mark Salyzyn · 9 years ago
  28. 5b06dc0 vsync.cpp test is throwing error whe compiled by Nanik Tolaram · 9 years ago
  29. 700619e am 58573ecd: am 485d3730: am f3f22e55: Merge "Add missing <unistd.h> include for close." by Elliott Hughes · 9 years ago
  30. 58573ec am 485d3730: am f3f22e55: Merge "Add missing <unistd.h> include for close." by Elliott Hughes · 9 years ago
  31. 485d373 am f3f22e55: Merge "Add missing <unistd.h> include for close." by Elliott Hughes · 9 years ago
  32. f3f22e5 Merge "Add missing <unistd.h> include for close." by Elliott Hughes · 9 years ago
  33. 14df356 Add missing <unistd.h> include for close. by Elliott Hughes · 9 years ago
  34. 2e099a5 am a6c2bcc4: am 28d41f56: Merge commit \'26cc3d0b67ff4daf31eaeed0ecd87b391978aadb\' into HEAD by Bill Yi · 9 years ago
  35. a6c2bcc am 28d41f56: Merge commit \'26cc3d0b67ff4daf31eaeed0ecd87b391978aadb\' into HEAD by Bill Yi · 9 years ago
  36. 28d41f5 Merge commit '26cc3d0b67ff4daf31eaeed0ecd87b391978aadb' into HEAD by Bill Yi · 9 years ago
  37. f630345 am a4201c10: am 592cc33c: am e86f7e96: am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  38. a4201c1 am 592cc33c: am e86f7e96: am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  39. 592cc33 am e86f7e96: am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  40. e86f7e9 am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  41. 3c0272b am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  42. dc2d031 am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  43. da9fd70 am 2758eb2e: am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  44. 2758eb2 am fde92eb0: Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  45. fde92eb Update maxNumber to be smaller. by Michael Lentine · 9 years ago
  46. cf359da am bf4fed77: am 5fa8f930: Merge "egl: Remove old tuna BGRA vs RGBA workaround." by Jesse Hall · 9 years ago
  47. bf4fed7 am 5fa8f930: Merge "egl: Remove old tuna BGRA vs RGBA workaround." by Jesse Hall · 9 years ago
  48. 5fa8f93 Merge "egl: Remove old tuna BGRA vs RGBA workaround." by Jesse Hall · 9 years ago
  49. ae5a081 am 7735c058: am c9aa628d: Cancel touch events when a low-level touch gesture occurs. by Jeff Brown · 9 years ago
  50. 7735c05 am c9aa628d: Cancel touch events when a low-level touch gesture occurs. by Jeff Brown · 9 years ago
  51. 326db4f Merge "Remove unnecessary settings state dump." by Svetoslav · 9 years ago
  52. d527bcb Remove unnecessary settings state dump. by Svetoslav · 9 years ago
  53. 4b2266d am 6576937f: am 75b81aee: Merge "Add missing <sys/file.h> include for flock." by Elliott Hughes · 9 years ago
  54. 6576937 am 75b81aee: Merge "Add missing <sys/file.h> include for flock." by Elliott Hughes · 9 years ago
  55. 75b81ae Merge "Add missing <sys/file.h> include for flock." by Elliott Hughes · 9 years ago
  56. 2ead70c Add missing <sys/file.h> include for flock. by Elliott Hughes · 9 years ago
  57. ee97017 Error compiling waitforvsync.cpp by Nanik Tolaram · 9 years ago
  58. 733a807 egl: Remove old tuna BGRA vs RGBA workaround. by Alistair Strachan · 9 years ago
  59. c9aa628 Cancel touch events when a low-level touch gesture occurs. by Jeff Brown · 9 years ago
  60. fc35dd8 am 26cc3d0b: am b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev by Nick Vaccaro · 9 years ago
  61. af428d4 am 459c0b6d: am 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices" by Lajos Molnar · 9 years ago
  62. 26cc3d0 am b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev by Nick Vaccaro · 9 years ago
  63. 459c0b6 am 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices" by Lajos Molnar · 9 years ago
  64. b9bb1f1 Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev by Nick Vaccaro · 9 years ago
  65. 9b6be8e Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices" by Lajos Molnar · 9 years ago
  66. 1d24efe am 34e32466: am 8511b3ae: Merge "Remove -z option." by Christopher Ferris · 9 years ago
  67. 34e3246 am 8511b3ae: Merge "Remove -z option." by Christopher Ferris · 9 years ago
  68. 8511b3a Merge "Remove -z option." by Christopher Ferris · 9 years ago
  69. ff4a4dc Remove -z option. by Christopher Ferris · 9 years ago
  70. 2f15949 am dac8c969: (-s ours) am d25be0ea: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar by Lajos Molnar · 9 years ago
  71. 9bb99b1 Add support for SENSOR_TYPE_WRIST_TILT_GESTURE by Nick Vaccaro · 9 years ago
  72. dac8c96 am d25be0ea: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar by Lajos Molnar · 9 years ago
  73. d25be0e DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar by Lajos Molnar · 9 years ago
  74. c7f664a am 8f706b5d: am ea5da67d: add bUsingNativeBuffers to DescribeColorFormatParams by Lajos Molnar · 9 years ago
  75. 8f706b5 am ea5da67d: add bUsingNativeBuffers to DescribeColorFormatParams by Lajos Molnar · 9 years ago
  76. 9368dad am 16c62c46: am 50ad67e4: Merge "Add better timeout mechanism for running commands." by Christopher Ferris · 9 years ago
  77. 16c62c4 am 50ad67e4: Merge "Add better timeout mechanism for running commands." by Christopher Ferris · 9 years ago
  78. 50ad67e Merge "Add better timeout mechanism for running commands." by Christopher Ferris · 9 years ago
  79. 1a9a338 Add better timeout mechanism for running commands. by Christopher Ferris · 9 years ago
  80. a27e2f7 Merge "Add ProcessInfoService to activity manager." by Ruben Brunk · 9 years ago
  81. 52f0407 Add ProcessInfoService to activity manager. by Ruben Brunk · 9 years ago
  82. 312a9e6 am 42b5e6d4: am 51bfedd8: Merge "Add missing includes." by Elliott Hughes · 9 years ago
  83. 42b5e6d am 51bfedd8: Merge "Add missing includes." by Elliott Hughes · 9 years ago
  84. ea5da67 add bUsingNativeBuffers to DescribeColorFormatParams by Lajos Molnar · 9 years ago
  85. 51bfedd Merge "Add missing includes." by Elliott Hughes · 9 years ago
  86. 824e30e Add missing includes. by Elliott Hughes · 9 years ago
  87. b3ca72c CpuConsumer: fix build error by Lajos Molnar · 9 years ago
  88. bacce71 Merge commit 'ec41d55b8d018f349f7687cfe491651db600b51d' by Chad Jones · 9 years ago
  89. 1bca4ee Merge commit '180c2ba763c32793c6d3c5fe2683f8f2b233ca10' by Chad Jones · 9 years ago
  90. ec41d55 am 94ee9b59: Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev by Lajos Molnar · 9 years ago
  91. 94ee9b5 Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev by Lajos Molnar · 9 years ago
  92. 180c2ba resolved conflicts for merge of 1f9f71e1 to lmp-mr1-dev-plus-aosp by Lajos Molnar · 9 years ago
  93. 9934f29 resolved conflicts for merge of 2f1e3b4d to master by Michael Lentine · 9 years ago
  94. 6a26be7 CpuConsumer: lock buffers that could be YUV as ycbcr by Lajos Molnar · 9 years ago
  95. 1f9f71e GraphicBufferMapper: handle devices that do not implement lock_ycbcr by Lajos Molnar · 9 years ago
  96. 2f1e3b4 am d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev by Michael Lentine · 9 years ago
  97. d6fce7a Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev by Michael Lentine · 9 years ago
  98. 54466bc Remove lock around ref count check in terminate. by Michael Lentine · 9 years ago
  99. 08741a0 am e55073a9: am 0e17a265: Merge "Switch dumpstate to "ip link list"." by Elliott Hughes · 9 years ago
  100. e55073a am 0e17a265: Merge "Switch dumpstate to "ip link list"." by Elliott Hughes · 9 years ago