1. c853784 am a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  2. a307beb Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  3. d09801b Camera2: Fix deadlock on shutdown due to client getting killed. by Eino-Ville Talvala · 11 years ago
  4. 75f912c am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev by Andreas Huber · 11 years ago
  5. 4fcff88 am 8d2d4932: audioflinger: fix duplicating track sampling rate by Eric Laurent · 11 years ago
  6. dd309b9 Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev by Andreas Huber · 11 years ago
  7. b5f28d4 Handle the case where an asynchronous prepare was initiated and then by Andreas Huber · 11 years ago
  8. 8d2d493 audioflinger: fix duplicating track sampling rate by Eric Laurent · 11 years ago
  9. 0fb06b8 am 0dbff625: Merge "Fix overflow of rand in ARTPConnection" by Andreas Huber · 11 years ago
  10. 2c2345c am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient" by Andreas Huber · 11 years ago
  11. 0dbff62 Merge "Fix overflow of rand in ARTPConnection" by Andreas Huber · 11 years ago
  12. 628a8c0 Merge "fix a race condition of MediaPlayerServce::Client::mClient" by Andreas Huber · 11 years ago
  13. e55951d am 7f86d983: Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev by Andreas Huber · 11 years ago
  14. 7f86d98 Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev by Andreas Huber · 11 years ago
  15. be21e03 Fix overflow of rand in ARTPConnection by Yajun Zeng · 11 years ago
  16. 3a9682a Remove all traces of wifi display sink implementation and supporting code. by Andreas Huber · 11 years ago
  17. b524303 am 5e437722: Merge "Camera3: Register all stream buffers at stream configuration time." into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  18. 5e43772 Merge "Camera3: Register all stream buffers at stream configuration time." into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  19. b0ec4e1 am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording" by Marco Nelissen · 11 years ago
  20. 3030f34 Merge "Fixed the wrong timestamps issue about camera recording" by Marco Nelissen · 11 years ago
  21. a93686a am 4613b7e3: Merge "3rd time\'s the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev by Andreas Huber · 11 years ago
  22. b9258b5 am d090054d: Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev by Igor Murashkin · 11 years ago
  23. 45f1f86 am f0fba380: Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev by Andreas Huber · 11 years ago
  24. 4613b7e Merge "3rd time's the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev by Andreas Huber · 11 years ago
  25. 6e5b6ef Fixed the wrong timestamps issue about camera recording by Jun Tian · 11 years ago
  26. cc8d4f8 Camera3: Register all stream buffers at stream configuration time. by Eino-Ville Talvala · 11 years ago
  27. d090054 Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev by Igor Murashkin · 11 years ago
  28. f0fba38 Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev by Andreas Huber · 11 years ago
  29. aa7f97b 3rd time's the charm, right? Fix another instance where MediaCodec would by Andreas Huber · 11 years ago
  30. 7e70133 A flush of a video decoder connected to a native window must reclaim by Andreas Huber · 11 years ago
  31. da01359 am 1de65a91: Merge "Fix error message to match CTS" into jb-mr2-dev by Glenn Kasten · 11 years ago
  32. e3cf96c am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev by Glenn Kasten · 11 years ago
  33. 1de65a9 Merge "Fix error message to match CTS" into jb-mr2-dev by Glenn Kasten · 11 years ago
  34. dbe6035 Merge "Use correct pid when running under test harness" into jb-mr2-dev by Glenn Kasten · 11 years ago
  35. 5bb603c am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev by Andreas Huber · 11 years ago
  36. 2c157e0 Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev by Andreas Huber · 11 years ago
  37. c2e8f14 am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev by Marco Nelissen · 11 years ago
  38. da77cee Merge "Fix sample info parsing" into jb-mr2-dev by Marco Nelissen · 11 years ago
  39. 2ffc2b8 am 5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging by Jamie Gennis · 11 years ago
  40. 5ffabf0 OMXNodeInstance: actually fix OMX_GetExtIndex logging by Jamie Gennis · 11 years ago
  41. 949a926 Use correct pid when running under test harness by Glenn Kasten · 11 years ago
  42. 5ea77ae Fix error message to match CTS by Glenn Kasten · 11 years ago
  43. c6deb68 Fix ProCameraTests to pass on Wolfie, disabling failing tests by Igor Murashkin · 11 years ago
  44. 03ddaec Make sure MediaCodec::stop() and MediaCodec::release() still return by Andreas Huber · 11 years ago
  45. 48186b6 Fix sample info parsing by Marco Nelissen · 11 years ago
  46. 4d9df49 am 64595e67: Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev by Jeff Tinker · 11 years ago
  47. 64595e6 Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev by Jeff Tinker · 11 years ago
  48. 45ae3d6 Add new error codes for DRM to improve error reporting by Jeff Tinker · 11 years ago
  49. 4707c9b am f7baffd1: Merge "Make sure the drain buffer is big enough" into jb-mr2-dev by Marco Nelissen · 11 years ago
  50. c9e1849 am 767fea95: Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev by Andreas Huber · 11 years ago
  51. f7baffd Merge "Make sure the drain buffer is big enough" into jb-mr2-dev by Marco Nelissen · 11 years ago
  52. 767fea9 Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev by Andreas Huber · 11 years ago
  53. 38e28e8 am 8dd719e4: Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev by Andreas Huber · 11 years ago
  54. 7aebfe0 am ed863845: Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev by Andreas Huber · 11 years ago
  55. 8dd719e Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev by Andreas Huber · 11 years ago
  56. ed86384 Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev by Andreas Huber · 11 years ago
  57. 42392e4 Apparently the mp3 decoder glitches if it was configured with the wrong by Andreas Huber · 11 years ago
  58. 65e0123 am 9e0727ca: Merge "Added CTS test for secure stop APIs" into jb-mr2-dev by Jeff Tinker · 11 years ago
  59. 9e0727c Merge "Added CTS test for secure stop APIs" into jb-mr2-dev by Jeff Tinker · 11 years ago
  60. 423e33c Added CTS test for secure stop APIs by Jeff Tinker · 11 years ago
  61. e42f027 Make sure the drain buffer is big enough by Marco Nelissen · 11 years ago
  62. da9740e Fix a typo that would cause us not to shutdown/flush the decoders in by Andreas Huber · 11 years ago
  63. 9ac6ff1 am 480721ea: Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  64. 480721e Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago
  65. 1e0757e Parse the last none-empty line of .m3u8 file by Sungsoo Lim · 12 years ago
  66. 212c97d am f5c02110: Merge "Guard against mLooper == NULL." into jb-mr2-dev by Andreas Huber · 11 years ago
  67. f5c0211 Merge "Guard against mLooper == NULL." into jb-mr2-dev by Andreas Huber · 11 years ago
  68. 844c8b0 am ff4b1e2b: Merge "Better default AAC DRC setting" into jb-mr2-dev by Jean-Michel Trivi · 11 years ago
  69. ff4b1e2 Merge "Better default AAC DRC setting" into jb-mr2-dev by Jean-Michel Trivi · 11 years ago
  70. 589bee3 am 94b66227: Fix Vorbis decoder reset by Marco Nelissen · 11 years ago
  71. 0e03e72 Better default AAC DRC setting by Jean-Michel Trivi · 11 years ago
  72. 94b6622 Fix Vorbis decoder reset by Marco Nelissen · 11 years ago
  73. a68e7b9 Guard against mLooper == NULL. by Andreas Huber · 11 years ago
  74. 5513704 Camera3: Allow multiple process_capture_result calls per request by Eino-Ville Talvala · 11 years ago
  75. f749a67 am f4c873a6: Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev by Marco Nelissen · 11 years ago
  76. f4c873a Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev by Marco Nelissen · 11 years ago
  77. a5a827c am 5182337f: Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev by Glenn Kasten · 11 years ago
  78. 5182337 Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev by Glenn Kasten · 11 years ago
  79. 7c5abbb Fix AAC decoder reconfiguration by Marco Nelissen · 11 years ago
  80. a768b4f am 8f1efee1: Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev by ztenghui · 11 years ago
  81. 8f1efee Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev by ztenghui · 11 years ago
  82. de05c8e MediaMuxer prefer not to use the MPEG4Writer in real time recording mode. by ztenghui · 11 years ago
  83. da69f1c Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  84. 2dd69cf am 5ce9c299: Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev by Andreas Huber · 11 years ago
  85. 5ce9c29 Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev by Andreas Huber · 11 years ago
  86. eadd1cf merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  87. 45ec469 am 7455393a: Merge "Update the test output path." into jb-mr2-dev by Yu Shan Emily Lau · 11 years ago
  88. 7455393 Merge "Update the test output path." into jb-mr2-dev by Yu Shan Emily Lau · 11 years ago
  89. 41f37e7 Update the test output path. by Yu Shan Emily Lau · 11 years ago
  90. 1d9c412 am 4a4256eb: Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev by Jamie Gennis · 11 years ago
  91. 4a4256e Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev by Jamie Gennis · 11 years ago
  92. fe028e5 am 089edf2e: Merge "Fix MediaCodec.flush()" into jb-mr2-dev by Marco Nelissen · 11 years ago
  93. 089edf2 Merge "Fix MediaCodec.flush()" into jb-mr2-dev by Marco Nelissen · 11 years ago
  94. f3bd197 Fix MediaCodec.flush() by Marco Nelissen · 11 years ago
  95. 4b40f7e am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev by Andreas Huber · 11 years ago
  96. 1e04c24 am c120d033: Merge "The framework really doesn\'t need to know the specifics of the codec" into jb-mr2-dev by Andreas Huber · 11 years ago
  97. 5157b1e Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev by Andreas Huber · 11 years ago
  98. c120d03 Merge "The framework really doesn't need to know the specifics of the codec" into jb-mr2-dev by Andreas Huber · 11 years ago
  99. 9a62391 Workaround: requestPriority() is one-way by Glenn Kasten · 11 years ago
  100. 3958caa am cb42f317: Merge "Camera3: Improve error logging" into jb-mr2-dev by Eino-Ville Talvala · 11 years ago