1. 7a2dbcd DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 by Wei Jia · 11 years ago
  2. 2048dd5 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea by Wei Jia · 11 years ago
  3. e0c9d8a DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours by Wei Jia · 11 years ago
  4. e3bbe23 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 by Wei Jia · 11 years ago
  5. db76a87 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 by Wei Jia · 11 years ago
  6. dd4576b DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 by Wei Jia · 11 years ago
  7. 862b693 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours by Wei Jia · 11 years ago
  8. bed81d6 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours by Wei Jia · 11 years ago
  9. 4c0d243 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 by Wei Jia · 11 years ago
  10. e4223a8 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 by Wei Jia · 11 years ago
  11. 9e1d775 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  12. 3e8e134 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  13. 6afc659 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  14. 0462975 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  15. 69bd1cf libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. by Wei Jia · 11 years ago
  16. 681bc45 Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""" into mnc-dev by Zach Jang · 11 years ago
  17. 6919fbe Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" into mnc-dev by Zach Jang · 11 years ago
  18. 3994ffd Revert "Revert "audio policy: bind setMode() and setPhoneState() operations"" by Zach Jang · 11 years ago
  19. a754b4f Revert "Revert "AudioPolicyService: fix race in AudioCommandThread"" by Zach Jang · 11 years ago
  20. cda4871 Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-dev by Zach Jang · 11 years ago
  21. be6f10c Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" into mnc-dev by Zach Jang · 11 years ago
  22. 26ce11a Revert "audio policy: bind setMode() and setPhoneState() operations" by Zach Jang · 11 years ago
  23. 75c82b5 Revert "AudioPolicyService: fix race in AudioCommandThread" by Zach Jang · 11 years ago
  24. fd72a5b GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 am: 7b5564e251 by Wei Jia · 11 years ago
  25. 000321c GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 by Wei Jia · 11 years ago
  26. 7b5564e GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 by Wei Jia · 11 years ago
  27. 92b6cd8 GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 by Wei Jia · 11 years ago
  28. 313358c GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 by Wei Jia · 11 years ago
  29. 09c291c GenericSource: reset mDecryptHandle when mDataSource is cleared. by Wei Jia · 11 years ago
  30. ddb3d77 GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a am: e01ba47052 by Wei Jia · 11 years ago
  31. adadada GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a by Wei Jia · 11 years ago
  32. e01ba47 GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 by Wei Jia · 11 years ago
  33. 3fcddfd GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 by Wei Jia · 11 years ago
  34. 69c8e36 GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  35. 224858e GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  36. e20b0eb Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749 am: 8e4f53159c by Jon Larimer · 11 years ago
  37. 8fbf202 Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749 by Jon Larimer · 11 years ago
  38. 8e4f531 Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 by Jon Larimer · 11 years ago
  39. 699e9b0 Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 by Jon Larimer · 11 years ago
  40. b44e95d Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d by Jon Larimer · 11 years ago
  41. 8565726 Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc by Jon Larimer · 11 years ago
  42. 781cd4f Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev by Jon Larimer · 11 years ago
  43. b1a13d0 Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into klp-dev by Jon Larimer · 11 years ago
  44. 4f16d20 Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-dev by Christian Bejram · 11 years ago
  45. 81fe612 Merge "AudioPolicyService: fix race in AudioCommandThread" into mnc-dev by Christian Bejram · 11 years ago
  46. 32ba6ec am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  47. 0378676 am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  48. 9299081 am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  49. b123192 am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  50. e550d21 am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  51. f70b69a Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev by Lajos Molnar · 11 years ago
  52. 9ddf1c7 audio policy: bind setMode() and setPhoneState() operations by Eric Laurent · 11 years ago
  53. 74ce88f AudioPolicyService: fix race in AudioCommandThread by Eric Laurent · 11 years ago
  54. 7b80648 am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  55. f30d7e0 am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  56. ce8029c am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  57. 5d805ec am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  58. f5bff8c am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  59. 77ab176 am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  60. 7d8bb7a am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  61. 149fc59 am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  62. 56d193a am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  63. 1f42a6c am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  64. 5a018d1 am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  65. c57ad1e am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  66. 0f21a68 Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev by Glenn Kasten · 11 years ago
  67. 55d1ea4 Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev by Glenn Kasten · 11 years ago
  68. 136ea31 am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev by Andy Hung · 11 years ago
  69. 602343b am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev by Andy Hung · 11 years ago
  70. 480f0ca am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev by Andy Hung · 11 years ago
  71. 9d1bc9f resolved conflicts for 4beea277 to lmp-mr1-dev by Andy Hung · 11 years ago
  72. 4c6e77f AudioFlinger: Clear record buffers when starting RecordThread by Andy Hung · 11 years ago
  73. 4beea27 am e5326d96: Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-dev by Andy Hung · 11 years ago
  74. e5326d9 Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-dev by Andy Hung · 11 years ago
  75. 5076a51 am ae827fb4: (-s ours) am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  76. ae827fb am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  77. 1231bdb am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  78. 6f23532 am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  79. d4ee847 am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  80. d1c9037 Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev by Andy Hung · 11 years ago
  81. 77c185d stagefright: check bounds for MediaCodecList.getCodecInfo by Lajos Molnar · 11 years ago
  82. a0f49d6 am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  83. d77dc13 am 91aa4a0a: (-s ours) am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev by Wei Jia · 11 years ago
  84. 867f877 am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  85. 91aa4a0 am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev by Wei Jia · 11 years ago
  86. 7ea1ed8 am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  87. f106f9e am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev by Wei Jia · 11 years ago
  88. 1b6bb62 am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  89. 15e991b resolved conflicts for 0b09da7a to lmp-mr1-dev by Wei Jia · 11 years ago
  90. 07d7031 am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  91. 0b1936b am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  92. dd184a4 am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  93. 0b09da7 am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev by Wei Jia · 11 years ago
  94. 04c02ee Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev by Wei Jia · 11 years ago
  95. 3b4a72a Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev by Wei Jia · 11 years ago
  96. 2482595 DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer. by Wei Jia · 11 years ago
  97. 4a03d78 DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer. by Wei Jia · 11 years ago
  98. 5dcef41 am a6b9d752: am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  99. a6b9d75 am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  100. d4df755 am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago