Gitiles
Code Review Sign In
review.evervolv.com / android_frameworks_av / e5bd62ba2d585b51e0024998dc45974803d1ae2d
  1. e5bd62b resolve merge conflicts of c73c64a to nyc-dev-plus-aosp by Glenn Kasten · 11 years ago
  2. da631f5 Merge "Fix build warnings" into nyc-dev am: 7be6866 by Glenn Kasten · 11 years ago
  3. 7be6866 Merge "Fix build warnings" into nyc-dev by Glenn Kasten · 11 years ago
  4. 57c4e6f Fix build warnings by Glenn Kasten · 11 years ago
  5. 066ba12 Merge "Fix copy and paste error" into nyc-dev am: 76f2713 by Glenn Kasten · 11 years ago
  6. 07fc599 Merge "Add systrace for normal read()" into nyc-dev am: 1c65a1d by Glenn Kasten · 11 years ago
  7. a875637 Merge "audioflinger: clear mMixerBuffer if frame is not ready" into nyc-dev by Mohan Kumar · 11 years ago
  8. 76f2713 Merge "Fix copy and paste error" into nyc-dev by Glenn Kasten · 11 years ago
  9. 1c65a1d Merge "Add systrace for normal read()" into nyc-dev by Glenn Kasten · 11 years ago
  10. c3418d0 Merge "audioflinger: clear mMixerBuffer if frame is not ready" into nyc-dev by Glenn Kasten · 11 years ago
  11. 947ffa3 audioflinger: clear mMixerBuffer if frame is not ready by Mohan Kumar · 12 years ago
  12. c73c64a Merge "audioflinger: clear mMixerBuffer if frame is not ready" by Glenn Kasten · 11 years ago
  13. 929290f Merge "audio: allow standby for direct track" into nyc-dev am: 1606b3f by vivek mehta · 11 years ago
  14. 1606b3f Merge "audio: allow standby for direct track" into nyc-dev by Eric Laurent · 11 years ago
  15. 9cd7ad1 audio: allow standby for direct track by vivek mehta · 11 years ago
  16. cfc3293 Merge "Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration" into nyc-dev by Eino-Ville Talvala · 11 years ago
  17. 2ac700b DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours am: 6c2dac8 am: 3d36f60 am: 58593db am: a4f84d2 -s ours by Marco Nelissen · 11 years ago
  18. 4185767 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 am: af4637c am: 7ac0d8f by Marco Nelissen · 11 years ago
  19. 3b7c222 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3 am: 0ee25ef by Marco Nelissen · 11 years ago
  20. 32dc5a9 Merge "Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration" into nyc-dev by Eino-Ville Talvala · 11 years ago
  21. 31c76d3 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours am: 6c2dac8 am: 3d36f60 am: 58593db by Marco Nelissen · 11 years ago
  22. 7726b9f resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 am: af4637c by Marco Nelissen · 11 years ago
  23. 17ec7d7 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3 by Marco Nelissen · 11 years ago
  24. 752936b Merge "Fix typo" into nyc-dev am: 8a9b5bf by Glenn Kasten · 11 years ago
  25. a4f84d2 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours am: 6c2dac8 am: 3d36f60 by Marco Nelissen · 11 years ago
  26. 7ac0d8f resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 by Marco Nelissen · 11 years ago
  27. 0ee25ef Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 by Marco Nelissen · 11 years ago
  28. 054c89f DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 am: 5df4326 am: a070ba6 -s ours by Marco Nelissen · 11 years ago
  29. 5b1c323 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 am: 22c973a am: abb5726 -s ours by Marco Nelissen · 11 years ago
  30. 63e9ad3 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 am: 81361a5 am: 37090fa by Marco Nelissen · 11 years ago
  31. 0bb7ef7 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 am: c716312 am: 8cbd657 -s ours by Marco Nelissen · 11 years ago
  32. c6c17c3 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 am: caa1360 am: 78d00c9 -s ours by Marco Nelissen · 11 years ago
  33. 8a9b5bf Merge "Fix typo" into nyc-dev by Glenn Kasten · 11 years ago
  34. 58593db DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours am: 6c2dac8 by Marco Nelissen · 11 years ago
  35. af4637c resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 by Marco Nelissen · 11 years ago
  36. 09def5e DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 am: 5df4326 by Marco Nelissen · 11 years ago
  37. 7836fa1 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 am: 22c973a by Marco Nelissen · 11 years ago
  38. ee0467a Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 am: 81361a5 by Marco Nelissen · 11 years ago
  39. 9989e10 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 am: c716312 by Marco Nelissen · 11 years ago
  40. 74e7dbd DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 am: caa1360 by Marco Nelissen · 11 years ago
  41. 3d36f60 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours by Marco Nelissen · 11 years ago
  42. 17b0060 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours by Marco Nelissen · 11 years ago
  43. 8379b72 Fix copy and paste error by Glenn Kasten · 11 years ago
  44. 8e55cd3 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 by Marco Nelissen · 11 years ago
  45. 6c2dac8 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 by Marco Nelissen · 11 years ago
  46. 30a52a4 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 by Marco Nelissen · 11 years ago
  47. 562cf01 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 by Marco Nelissen · 11 years ago
  48. ec6a703 Add systrace for normal read() by Glenn Kasten · 11 years ago
  49. 68a43d3 Merge "Add VPX output buffer size check" into mnc-dev by Marco Nelissen · 11 years ago
  50. a070ba6 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 by Marco Nelissen · 11 years ago
  51. abb5726 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 by Marco Nelissen · 11 years ago
  52. 37090fa Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 by Marco Nelissen · 11 years ago
  53. 8cbd657 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 by Marco Nelissen · 11 years ago
  54. 78d00c9 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 by Marco Nelissen · 11 years ago
  55. 5df4326 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 by Marco Nelissen · 11 years ago
  56. 22c973a Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 by Marco Nelissen · 11 years ago
  57. 81361a5 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d by Marco Nelissen · 11 years ago
  58. c716312 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 by Marco Nelissen · 11 years ago
  59. caa1360 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 by Marco Nelissen · 11 years ago
  60. c51bc92 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours by Marco Nelissen · 11 years ago
  61. a9ba5e9 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours by Marco Nelissen · 11 years ago
  62. 4f38da4 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 by Marco Nelissen · 11 years ago
  63. 8644100 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours by Marco Nelissen · 11 years ago
  64. 28d4ca0 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours by Marco Nelissen · 11 years ago
  65. f19eec3 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee by Marco Nelissen · 11 years ago
  66. 3af5111 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af by Marco Nelissen · 11 years ago
  67. 30e2c0d Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 by Marco Nelissen · 11 years ago
  68. 1be8671 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 by Marco Nelissen · 11 years ago
  69. ccad831 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b by Marco Nelissen · 11 years ago
  70. 78ac0e7 Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev by Lajos Molnar · 11 years ago
  71. a558bf1 Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev by Lajos Molnar · 11 years ago
  72. cbdc988 Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev by Lajos Molnar · 11 years ago
  73. d40ea87 Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev by Lajos Molnar · 11 years ago
  74. 26ae699 Fix typo by Glenn Kasten · 11 years ago
  75. ace8058 Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration by Eino-Ville Talvala · 11 years ago
  76. 192f85d DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 by Marco Nelissen · 11 years ago
  77. e559250 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours by Marco Nelissen · 11 years ago
  78. 099db66 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 by Marco Nelissen · 11 years ago
  79. 73ea429 Merge "Update audio services for 64 bit compilation" into nyc-dev am: 560a198 by Andy Hung · 11 years ago
  80. f79ccd5 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa by Marco Nelissen · 11 years ago
  81. 5103111 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours by Marco Nelissen · 11 years ago
  82. 560a198 Merge "Update audio services for 64 bit compilation" into nyc-dev by Andy Hung · 11 years ago
  83. 77e43fa resolve merge conflicts of c66f8dd to lmp-mr1-dev by Marco Nelissen · 11 years ago
  84. 5ff52d6 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 by Marco Nelissen · 11 years ago
  85. 53af00c Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 by Marco Nelissen · 11 years ago
  86. df7dbf9 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c by Marco Nelissen · 11 years ago
  87. 0ab6ee3 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 by Marco Nelissen · 11 years ago
  88. 01c682b DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 by Marco Nelissen · 11 years ago
  89. e26d4ee DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours by Marco Nelissen · 11 years ago
  90. 89036af Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours by Marco Nelissen · 11 years ago
  91. 2828c06 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 by Marco Nelissen · 11 years ago
  92. d495a59 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours by Marco Nelissen · 11 years ago
  93. a93123b DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours by Marco Nelissen · 11 years ago
  94. 1ba0a54 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours by Marco Nelissen · 11 years ago
  95. d92d909 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev by Marco Nelissen · 11 years ago
  96. 4f0585c Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 by Marco Nelissen · 11 years ago
  97. f50a3b4 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours by Marco Nelissen · 11 years ago
  98. cc2a866 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours by Marco Nelissen · 11 years ago
  99. b363544 Merge "Camera: validate input in releaseRecordingFrame" into nyc-dev am: c40fcb0 by Chien-Yu Chen · 11 years ago
  100. c40fcb0 Merge "Camera: validate input in releaseRecordingFrame" into nyc-dev by Chien-Yu Chen · 11 years ago