1. b53fc4e resolved conflicts for merge of 47c888a9 to master by Glenn Kasten · 12 years ago
  2. 47c888a am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 12 years ago
  3. e580aa4 am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 12 years ago
  4. 8643838 Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 12 years ago
  5. 33ddcb6 Merge "Use AUDIO_INTERLEAVE_* constants" by Glenn Kasten · 12 years ago
  6. 8710fb4 am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 12 years ago
  7. f38e190 am 3d9164da: am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 12 years ago
  8. 3d9164d am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 12 years ago
  9. 236f8dd Merge "Add missing include" by Glenn Kasten · 12 years ago
  10. 877a0ac Use AUDIO_INTERLEAVE_* constants by Glenn Kasten · 12 years ago
  11. 1a7be1e Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD by Bill Yi · 12 years ago
  12. 29fe1ea am 9829344d: Merge "media: memset sizeof argument issues" by Mark Salyzyn · 12 years ago
  13. d6579cc media: memset sizeof argument issues by Mark Salyzyn · 12 years ago
  14. 80a5d30 Add missing include by Igor Chernyshev · 12 years ago
  15. 99021c4 am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm by Jeff Tinker · 12 years ago
  16. f356a12 am 68d9d71a: Support CAST V2 Authentication in MediaDrm by Jeff Tinker · 12 years ago
  17. 68d9d71 Support CAST V2 Authentication in MediaDrm by Jeff Tinker · 13 years ago
  18. c9b8d90 Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>" by Glenn Kasten · 13 years ago
  19. 5c4fa90 Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL" by Glenn Kasten · 13 years ago
  20. 142f519 Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h> by Glenn Kasten · 13 years ago
  21. 2301acc Update comments by Glenn Kasten · 13 years ago
  22. adad3d7 Use LOG_ALWAYS_FATAL instead of LOG_FATAL by Glenn Kasten · 13 years ago
  23. ecdca39 Merge "Use symbolic constants from <system/audio.h>" by Glenn Kasten · 13 years ago
  24. 51beebb Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>" by Glenn Kasten · 13 years ago
  25. b8f8d23 Merge "Remove stream type from AudioSystem::getRenderPosition()" by Glenn Kasten · 13 years ago
  26. 73ec117 Merge "Fix uses of KeyedVector" by Glenn Kasten · 13 years ago
  27. 8c7b9fb Merge "Remove streamType parameter from AudioSystem::getLatency()" by Glenn Kasten · 13 years ago
  28. 0ed1959 Remove stream type from AudioSystem::getRenderPosition() by Glenn Kasten · 13 years ago
  29. f7f21b9 Merge "Remove dead code" by Glenn Kasten · 13 years ago
  30. ebb80e4 Remove dead code by Glenn Kasten · 13 years ago
  31. 241618f Remove streamType parameter from AudioSystem::getLatency() by Glenn Kasten · 13 years ago
  32. 45faf7e Use symbol AUDIO_DEVICE_NONE from <system/audio.h> by Glenn Kasten · 13 years ago
  33. 66e4635 Use symbolic constants from <system/audio.h> by Glenn Kasten · 13 years ago
  34. 9ea65d0 Fix uses of KeyedVector by Glenn Kasten · 13 years ago
  35. 85d109a Document AudioSystem::newAudioSessionId() failures by Glenn Kasten · 13 years ago
  36. 1392eb3 Fix operator precedence by Glenn Kasten · 13 years ago
  37. d4a31b8 Merge "Add MediaPlayer::getAudioStreamType." by John Spurlock · 13 years ago
  38. de9453f Add MediaPlayer::getAudioStreamType. by John Spurlock · 13 years ago
  39. bfd55f2 Use more tags to help the ICU detector. by Marco Nelissen · 13 years ago
  40. c5a1742 Remove name output parameter from createTrack by Glenn Kasten · 13 years ago
  41. c644345 Merge "AudioTrack non-blocking write" by Jean-Michel Trivi · 13 years ago
  42. 3a90f28 Fix freeze on pause by Marco Nelissen · 13 years ago
  43. f566406 am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 13 years ago
  44. 6950d10 am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev by Glenn Kasten · 13 years ago
  45. 3a20f9a am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 13 years ago
  46. 38efe8e am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 13 years ago
  47. 6db20dc Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 13 years ago
  48. 77a85eb am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev by Glenn Kasten · 13 years ago
  49. 4ee774f am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev by Glenn Kasten · 13 years ago
  50. dcec903 Simplify AudioTrack stream end and fix race by Glenn Kasten · 13 years ago
  51. b8d0b78 am af191eb4: Merge "Replace size_t in shared memory by uint32_t" by Glenn Kasten · 13 years ago
  52. e857b65 am 3c9130a8: Merge "Make frameworks/av 64-bit compatible" by Narayan Kamath · 13 years ago
  53. 32fbb48 am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling is required" by Glenn Kasten · 13 years ago
  54. 2048c22 AudioTrack: When paused, return cached playback position by Haynes Mathew George · 13 years ago
  55. 1c32a00 Merge "Simplify AudioTrack stream end and fix race" by Glenn Kasten · 13 years ago
  56. 7064fd2 AudioTrack: When paused, return cached playback position by Haynes Mathew George · 13 years ago
  57. ebcb254 audio policy service: clean up type casting. by Eric Laurent · 13 years ago
  58. c1e06f6 am 09e45992: am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculation by Eric Laurent · 13 years ago
  59. 25a8693 am 88876fb4: AudioTrack: fix obtainBuffer timeout calculation by Eric Laurent · 13 years ago
  60. d812fc0 Increase kFastTrackMultiplier from 1 to 2 by Glenn Kasten · 13 years ago
  61. 88876fb AudioTrack: fix obtainBuffer timeout calculation by Eric Laurent · 13 years ago
  62. d0115d8 update offloaded audio track sampling rate by Eric Laurent · 13 years ago
  63. 720ad9d AudioTrack non-blocking write by Jean-Michel Trivi · 13 years ago
  64. ecc8155 Merge "Make openRecord_l more like createTrack_l for fast tracks: part 3" by Glenn Kasten · 13 years ago
  65. f0aaabf Merge "Make openRecord_l more like createTrack_l for fast tracks: part 2" by Glenn Kasten · 13 years ago
  66. 8797070 Make openRecord_l more like createTrack_l for fast tracks: part 3 by Glenn Kasten · 13 years ago
  67. 2c48f27 Make openRecord_l more like createTrack_l for fast tracks: part 2 by Glenn Kasten · 13 years ago
  68. d2304db Rename setStreamOutput to invalidateStream by Glenn Kasten · 13 years ago
  69. 33ca5cf Merge "Make openRecord_l more like createTrack_l for fast tracks: part 1" by Glenn Kasten · 13 years ago
  70. bce50bf Fix type of AudioTrack/AudioRecord parameter frameCount by Glenn Kasten · 13 years ago
  71. 838b3d8 Fix type of AudioTrack/AudioRecord parameter notificationFrames by Glenn Kasten · 13 years ago
  72. 484b4cd Merge "Don't crash on remote read error, just return" by Marco Nelissen · 13 years ago
  73. c6ba823 Make openRecord_l more like createTrack_l for fast tracks: part 1 by Glenn Kasten · 13 years ago
  74. 19a9fef Don't crash on remote read error, just return by Marco Nelissen · 13 years ago
  75. e27e2d9 Fix includes to no longer pull in Skia includes directories. by Derek Sollenberger · 13 years ago
  76. c08d20b Simplify error handling after track creation by Glenn Kasten · 13 years ago
  77. 045e739 Move initialize of mInput to match AudioTrack by Glenn Kasten · 13 years ago
  78. f7cc363 Update comments to match AudioTrack by Glenn Kasten · 13 years ago
  79. a5ed48d Move initialization of mRefreshRemaining to match AudioTrack by Glenn Kasten · 13 years ago
  80. 591d9a3 Merge "mAudioRecord is always non-0 if set() is successful" by Glenn Kasten · 13 years ago
  81. 7c1b894 Merge "Unify comments and whitespace between AudioTrack and AudioRecord" by Glenn Kasten · 13 years ago
  82. 6c69333 Merge "Update channel fields at same place in AudioTrack and AudioRecord" by Glenn Kasten · 13 years ago
  83. 882469c Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord" by Glenn Kasten · 13 years ago
  84. 99ef241a Merge "Permit AudioRecord to support non-linear formats in future" by Glenn Kasten · 13 years ago
  85. 9f474b7 Merge "Simplify and cleanup error handling in AudioRecord::getMinFrameCount" by Glenn Kasten · 13 years ago
  86. 172abfe Merge "Add log at entry to set() in AudioTrack and AudioRecord" by Glenn Kasten · 13 years ago
  87. b42f318 Simplify and cleanup error handling in AudioRecord::getMinFrameCount by Glenn Kasten · 13 years ago
  88. 089e872 mAudioRecord is always non-0 if set() is successful by Glenn Kasten · 13 years ago
  89. 5f63151 Unify comments and whitespace between AudioTrack and AudioRecord by Glenn Kasten · 13 years ago
  90. e3247bf Update channel fields at same place in AudioTrack and AudioRecord by Glenn Kasten · 13 years ago
  91. 11cb175 Update mReqFrameCount at same point in AudioTrack and AudioRecord by Glenn Kasten · 13 years ago
  92. c85df82b Permit AudioRecord to support non-linear formats in future by Glenn Kasten · 13 years ago
  93. 86f0466 Add log at entry to set() in AudioTrack and AudioRecord by Glenn Kasten · 13 years ago
  94. c9c7e25 Add method to get redirected Uri by Marco Nelissen · 13 years ago
  95. e9841c6 Merge "Simplify and remove old comment" by Glenn Kasten · 13 years ago
  96. 6dd62fb Multi-client recording by Glenn Kasten · 13 years ago
  97. ee37590 Simplify and remove old comment by Glenn Kasten · 13 years ago
  98. f3b785a Merge "Move StateQueueInstantiations to libinstantssq" by Glenn Kasten · 13 years ago
  99. 3e8027a Move StateQueueInstantiations to libinstantssq by Glenn Kasten · 13 years ago
  100. 7074296 Fix warning due to incorrect log format by Glenn Kasten · 13 years ago