1. 515fb7a Merge "Fix overflow in amrwbenc" am: b135d0e6fb am: 9f2e05eb78 by Marco Nelissen · 10 years ago
  2. 9f2e05e Merge "Fix overflow in amrwbenc" am: b135d0e6fb by Marco Nelissen · 10 years ago
  3. b135d0e Merge "Fix overflow in amrwbenc" by Marco Nelissen · 10 years ago
  4. bc8c47e Fix overflow in amrwbenc by Marco Nelissen · 10 years ago
  5. 7c1615d resolve merge conflicts of 85234a9133 to master. by Marco Nelissen · 10 years ago
  6. 85234a9 Merge "Tabs -> spaces" am: e491d0baa3 by Marco Nelissen · 10 years ago
  7. 9bf5ba1 Merge "Fix overflows in amrwbenc" am: bcd54f426f am: caf74f7732 by Marco Nelissen · 10 years ago
  8. caf74f7 Merge "Fix overflows in amrwbenc" am: bcd54f426f by Marco Nelissen · 10 years ago
  9. e491d0b Merge "Tabs -> spaces" by Marco Nelissen · 10 years ago
  10. 5d5c3a1 Tabs -> spaces by Marco Nelissen · 10 years ago
  11. bcd54f4 Merge "Fix overflows in amrwbenc" by Marco Nelissen · 10 years ago
  12. 13158e7 Fix overflows in amrwbenc by Marco Nelissen · 10 years ago
  13. 96d4f4a Merge "Fix overflows in amrwbenc" by Dan Austin · 10 years ago
  14. d23f7ef Fix overflows in amrwbenc by Marco Nelissen · 10 years ago
  15. d0ef20e Merge "Camera: Support BufferQueue between Camera and StageFright" by Chien-Yu Chen · 10 years ago
  16. 6152b8c Merge "audio policy: engine configurable: do not compile example makefile" by Eric Laurent · 10 years ago
  17. c187d3f Merge "Remove unused MediaDrm.unprovisionDevice" by Jeff Tinker · 10 years ago
  18. 6ca0256 Remove unused MediaDrm.unprovisionDevice by Jeff Tinker · 10 years ago
  19. b5959c7 audio policy: engine configurable: do not compile example makefile by François Gaffie · 10 years ago
  20. cbc455f Merge "Camera: plumbing for RAW OPAQUE" by Yin-Chia Yeh · 10 years ago
  21. 1ddc4b8 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f am: 0e7c8849a9 am: eb030dc365 by Chong Zhang · 10 years ago
  22. 4e119b6 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f am: 0e7c8849a9 by Chong Zhang · 10 years ago
  23. eb030dc DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f by Chong Zhang · 10 years ago
  24. 0e7c884 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 by Chong Zhang · 10 years ago
  25. 3cb2e67 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours by Chong Zhang · 10 years ago
  26. e6185af DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab by Chong Zhang · 10 years ago
  27. fe2d80d DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c by Chong Zhang · 10 years ago
  28. 8348718 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c by Chong Zhang · 10 years ago
  29. e9154ce Camera: plumbing for RAW OPAQUE by Yin-Chia Yeh · 10 years ago
  30. 5be2304 Merge "Camera: fix HAL1.0 support" by Yin-Chia Yeh · 10 years ago
  31. bbe860d Fix integer overflow in amrwbenc by Marco Nelissen · 10 years ago
  32. 654b4bf Camera: fix HAL1.0 support by Yin-Chia Yeh · 10 years ago
  33. 8cca075 Camera: Support BufferQueue between Camera and StageFright by Chien-Yu Chen · 10 years ago
  34. 4aeee81 Merge "Fix security vulnerability in ICrypto" by Jeff Tinker · 10 years ago
  35. a6b3ed1 Merge "Camera: set mNumberOfNormalCameras correctly" by Yin-Chia Yeh · 10 years ago
  36. 169e8eb Camera: set mNumberOfNormalCameras correctly by Yin-Chia Yeh · 10 years ago
  37. d00a17d Merge "Check for non-negative fd before close, dup, lseek, or read." by Andy Hung · 10 years ago
  38. ec1efa0 Merge "AudioPolicyManager: AudioInputDescriptor open ref count cleanup" by Jean-Michel Trivi · 10 years ago
  39. b20688e Check for non-negative fd before close, dup, lseek, or read. by Andy Hung · 10 years ago
  40. 8fa2458 Merge "audio policy: configurable engine: fix dead lock issue" by Eric Laurent · 10 years ago
  41. bb4877d Fix security vulnerability in ICrypto by Jeff Tinker · 10 years ago
  42. 65bfe91 AudioPolicyManager: AudioInputDescriptor open ref count cleanup by Jean-Michel Trivi · 10 years ago
  43. 8649a34 audio policy: configurable engine: fix dead lock issue by François Gaffie · 10 years ago
  44. 91a23ed DO NOT MERGE nuplayer: do not use cached source for wvm content by Chong Zhang · 10 years ago
  45. 0a62162 Merge "Validation of Number of Channels on WAV files." am: 8ec6ab3bfa am: bc6d05bac1 by Jean-Michel Trivi · 10 years ago
  46. b6c63ca DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f am: 6cd7a9f811 am: 83066d1046 by Andy Hung · 10 years ago
  47. e6b4530 Merge "Validation of Number of Channels on WAV files." am: 8ec6ab3bfa by Jean-Michel Trivi · 10 years ago
  48. bc6d05b Merge "Validation of Number of Channels on WAV files." am: 8ec6ab3bfa by Jean-Michel Trivi · 10 years ago
  49. 8ec6ab3 Merge "Validation of Number of Channels on WAV files." by Jean-Michel Trivi · 10 years ago
  50. 778d09b Validation of Number of Channels on WAV files. by Niel Alejandro Paz · 10 years ago
  51. ebdddf8 Merge "audio policy: enhancing type conversion helper" by Eric Laurent · 10 years ago
  52. cf52591 Merge "CameraService: Remove device HALv2 support, other cleanup" by Eino-Ville Talvala · 10 years ago
  53. 465792d DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f am: 6cd7a9f811 by Andy Hung · 10 years ago
  54. fd51bde Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c am: 047cfaf95a am: 3abe346ed2 by Andy Hung · 10 years ago
  55. 6760258 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 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 am: 29ff7f2ac7 am: 946388cc94 by Wei Jia · 10 years ago
  56. 555ad36 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb am: 2c7411483b am: 062ea7264f by Wei Jia · 10 years ago
  57. 945e0d7 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 am: d1bcd1a80f am: ff0c114eae by Wei Jia · 10 years ago
  58. 83066d1 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f by Andy Hung · 10 years ago
  59. f8ad572 Merge "Volume should take VOLUME_MIN_DB value when audio is muted." am: 2e12b68fad am: e04b1e747e by Eric Laurent · 10 years ago
  60. ffa5d53 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c am: 047cfaf95a by Andy Hung · 10 years ago
  61. 6cd7a9f DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 by Andy Hung · 10 years ago
  62. 728a7aa Merge "NuPlayerRenderer: Allow immediate pause on next track." by Andy Hung · 10 years ago
  63. 0357d35 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours by Andy Hung · 10 years ago
  64. 3abe346 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c by Andy Hung · 10 years ago
  65. 6d3f50d DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 by Andy Hung · 10 years ago
  66. 8f283a8 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 by Andy Hung · 10 years ago
  67. 047cfaf Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 by Andy Hung · 10 years ago
  68. 9161b6a DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours by Andy Hung · 10 years ago
  69. b516109 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours by Andy Hung · 10 years ago
  70. 975bb62 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 by Andy Hung · 10 years ago
  71. 92edb17 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b by Andy Hung · 10 years ago
  72. 569d39f Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 by Andy Hung · 10 years ago
  73. f4dfde9 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours by Andy Hung · 10 years ago
  74. adfda28 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours by Andy Hung · 10 years ago
  75. c565559 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 by Andy Hung · 10 years ago
  76. bb1809a Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 by Andy Hung · 10 years ago
  77. 208bc47 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread by Andy Hung · 10 years ago
  78. 8420073 NuPlayerRenderer: Allow immediate pause on next track. by Andy Hung · 10 years ago
  79. ba49fda Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev by Andy Hung · 10 years ago
  80. 0c4d693 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev by Andy Hung · 10 years ago
  81. 469826c Merge "Use modulo position variables in AudioTrack and AudioRecord" by Andy Hung · 10 years ago
  82. 3d6a714 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread by Andy Hung · 10 years ago
  83. fffc234 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 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 am: 29ff7f2ac7 by Wei Jia · 10 years ago
  84. 946388c 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 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 by Wei Jia · 10 years ago
  85. 694c766 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb am: 2c7411483b by Wei Jia · 10 years ago
  86. 29ff7f2 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 am: 2048dd5483 -s ours am: 7a2dbcd38b by Wei Jia · 10 years ago
  87. f766fdb 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 am: 2048dd5483 -s ours by Wei Jia · 10 years ago
  88. 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 · 10 years ago
  89. 062ea72 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb by Wei Jia · 10 years ago
  90. 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 · 10 years ago
  91. 2c74114 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 by Wei Jia · 10 years ago
  92. 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 · 10 years ago
  93. b7e63bf DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours by Wei Jia · 10 years ago
  94. 9e1e002 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 am: d1bcd1a80f by Wei Jia · 10 years ago
  95. 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 · 10 years ago
  96. 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 · 10 years ago
  97. 862b693 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours by Wei Jia · 10 years ago
  98. 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 · 10 years ago
  99. 4c0d243 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 by Wei Jia · 10 years ago
  100. ff0c114 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 by Wei Jia · 10 years ago