1. 15e991b resolved conflicts for 0b09da7a to lmp-mr1-dev by Wei Jia · 11 years ago
  2. 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
  3. 04c02ee Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev by Wei Jia · 11 years ago
  4. 2482595 DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer. by Wei Jia · 11 years ago
  5. 39f64a1 am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  6. 8b713f1 am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  7. b75a78d am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  8. fc0e2a8 am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  9. 7ed8d1e ID3: check possible integer overflow for extendedHeaderSize and paddingSize. by Wei Jia · 11 years ago
  10. 64cdd5f am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev by Marco Nelissen · 11 years ago
  11. f2cf2bd am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev by Marco Nelissen · 11 years ago
  12. fb0d63d am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev by Wei Jia · 11 years ago
  13. 07395f4 am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev by Marco Nelissen · 11 years ago
  14. 00f5fa8 am 74d1927e: Merge "Check NAL size before use" into klp-dev by Marco Nelissen · 11 years ago
  15. 62d8990 am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev by Wei Jia · 11 years ago
  16. df68d9d am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev by Wei Jia · 11 years ago
  17. 74d1927 Merge "Check NAL size before use" into klp-dev by Marco Nelissen · 11 years ago
  18. 60b25aa am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev by Wei Jia · 11 years ago
  19. 9ab9c85 Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev by Wei Jia · 11 years ago
  20. 567ad5c am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame by Marco Nelissen · 11 years ago
  21. 7ce8258 am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame by Marco Nelissen · 11 years ago
  22. 13b6b51 am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame by Marco Nelissen · 11 years ago
  23. f7d1f62 am 257b3bc5: Don\'t crash when there\'s no conceal frame by Marco Nelissen · 11 years ago
  24. 5d10129 Check NAL size before use by Marco Nelissen · 11 years ago
  25. e6d904f MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData. by Wei Jia · 11 years ago
  26. 257b3bc Don't crash when there's no conceal frame by Marco Nelissen · 11 years ago
  27. bdaee5e am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel by Flanker · 11 years ago
  28. 5226d6b am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcel by Flanker · 11 years ago
  29. e64d487 am 2b8cd9cb: stagefright: fix AMessage::FromParcel by Flanker · 11 years ago
  30. 3737a3f DO NOT MERGE stagefright: fix AMessage::FromParcel by Flanker · 11 years ago
  31. 2b8cd9c stagefright: fix AMessage::FromParcel by Flanker · 11 years ago
  32. 9250427 am 7e1d645f: am a8f90d57: Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev by Wei Jia · 11 years ago
  33. 9dcb4c6 am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev by Jeff Tinker · 11 years ago
  34. 1ac1112 am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev by Jeff Tinker · 11 years ago
  35. dae1d8d am 5d76aca5: am 21fda3ed: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into lmp-dev by Wei Jia · 11 years ago
  36. 6961db7 am 04bbef0b: am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev by Wonsik Kim · 11 years ago
  37. c370812 am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev by Wonsik Kim · 11 years ago
  38. 5e46ca5 am 3b130dbd: am c5121002: am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error. by Wei Jia · 11 years ago
  39. 7e1d645 am a8f90d57: Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev by Wei Jia · 11 years ago
  40. a8f90d5 Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev by Wei Jia · 11 years ago
  41. 4554ffd am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev by Jeff Tinker · 11 years ago
  42. 52b829c am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev by Jeff Tinker · 11 years ago
  43. 4ae700d am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev by Jeff Tinker · 11 years ago
  44. d83f225 am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev by Jeff Tinker · 11 years ago
  45. 160ed86 Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev by Jeff Tinker · 11 years ago
  46. 6272fa1 Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev by Jeff Tinker · 11 years ago
  47. 99e63e7 Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev by Jeff Tinker · 11 years ago
  48. f43125e Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev by Jeff Tinker · 11 years ago
  49. 40715a2 IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel. by Wei Jia · 11 years ago
  50. 190786d am ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev by Wei Jia · 11 years ago
  51. 5d76aca am 21fda3ed: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into lmp-dev by Wei Jia · 11 years ago
  52. e128922 am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev by Wei Jia · 11 years ago
  53. 4d27a46 am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev by Wonsik Kim · 11 years ago
  54. f7c4016 am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev by Wonsik Kim · 11 years ago
  55. 5e7e87a DO NOT MERGE Fix vulnerability in mediaserver by Jeff Tinker · 11 years ago
  56. 636539e DO NOT MERGE Fix vulnerability in mediaserver by Jeff Tinker · 11 years ago
  57. 3b76870 DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel. by Wei Jia · 11 years ago
  58. 8336fc4 DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel. by Wei Jia · 11 years ago
  59. 9860dcd am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev by Wonsik Kim · 11 years ago
  60. 04bbef0 am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev by Wonsik Kim · 11 years ago
  61. 5c09132 Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev by Wonsik Kim · 11 years ago
  62. b21a642 Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev by Wonsik Kim · 11 years ago
  63. 4b219e9 Fix for security vulnerability in media server DO NOT MERGE by Jeff Tinker · 11 years ago
  64. 9adc728 Fix for security vulnerability in media server DO NOT MERGE by Jeff Tinker · 11 years ago
  65. 67f36a8 resolved conflicts for 76b704e3 to lmp-mr1-dev by Wonsik Kim · 11 years ago
  66. 2d945b6 am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev by Wonsik Kim · 11 years ago
  67. 4855cc3 Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev by Wonsik Kim · 11 years ago
  68. 0d35dd2 DO NOT MERGE NuCachedSource2: fix possible erroneous early free by Wonsik Kim · 11 years ago
  69. c894f81 DO NOT MERGE NuCachedSource2: fix possible erroneous early free by Wonsik Kim · 11 years ago
  70. 820c105 DO NOT MERGE Avoid size_t overflow in base64 decoding once again by Wonsik Kim · 11 years ago
  71. 3b130db am c5121002: am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error. by Wei Jia · 11 years ago
  72. c512100 am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error. by Wei Jia · 11 years ago
  73. dc81ada am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev by Wei Jia · 11 years ago
  74. 92efd0c am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev by Wonsik Kim · 11 years ago
  75. 5f5fc26 am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev by Wonsik Kim · 11 years ago
  76. 76b704e am f3eb8268: DO NOT MERGE: Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  77. 8cfd0ac am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev by Wei Jia · 11 years ago
  78. 741a335 Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev by Wei Jia · 11 years ago
  79. 44da08e am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev by Wonsik Kim · 11 years ago
  80. b659b4c Merge "DO NOT MERGE fix build" into klp-dev by Wonsik Kim · 11 years ago
  81. 9104e70 DO NOT MERGE fix build by Wonsik Kim · 11 years ago
  82. 1507bbb am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev by Wonsik Kim · 11 years ago
  83. b5611b8 Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev by Wonsik Kim · 11 years ago
  84. 28314ae Revert "Avoid size_t overflow in base64 decoding once again" by Wonsik Kim · 11 years ago
  85. 322e2dc Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev by Wonsik Kim · 11 years ago
  86. 1784a8d Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev by Wonsik Kim · 11 years ago
  87. c256004 am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error. by Wei Jia · 11 years ago
  88. 1c77198 DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel. by Wei Jia · 11 years ago
  89. 5f2a76f DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel. by Wei Jia · 11 years ago
  90. 278ed11 DO NOT MERGE Avoid size_t overflow in base64 decoding once again by Wonsik Kim · 11 years ago
  91. c9ac5df Avoid size_t overflow in base64 decoding once again by Wonsik Kim · 11 years ago
  92. f3eb826 DO NOT MERGE: Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  93. 69ae6a8 libstagefright: fix A_Refl to return immediately when there is an error. by Wei Jia · 11 years ago
  94. d021f7e am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev by Robert Shih · 11 years ago
  95. be695f0 am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev by Andy Hung · 11 years ago
  96. 9bbc490 am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev by Marco Nelissen · 11 years ago
  97. ce34a82 am 7ea22fce: am c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp by Wei Jia · 11 years ago
  98. b18c027 am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev by Robert Shih · 11 years ago
  99. 5e19304 am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev by Andy Hung · 11 years ago
  100. facd279 am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev by Marco Nelissen · 11 years ago