1. 05e13b9 am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 by James Dong · 14 years ago
  2. 64a2343 Revert "Use pread() to get the decrypted data for container based DRM file." by James Dong · 14 years ago
  3. 6e5cdca am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 by Jeffrey Tinker · 14 years ago
  4. ef89cc1 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 by Jeffrey Tinker · 14 years ago
  5. 8264641 Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 by Jeffrey Tinker · 14 years ago
  6. ebae192 am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). by James Dong · 14 years ago
  7. a5293d1 Add some logging to track down where ANR happens during MediaPlayer._release(). by James Dong · 14 years ago
  8. dbfd055 am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. by Gloria Wang · 14 years ago
  9. a6f1104 Use pread() to get the decrypted data for container based DRM file. by Gloria Wang · 14 years ago
  10. 380244e am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 by James Dong · 14 years ago
  11. d148a49 Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 by James Dong · 14 years ago
  12. 5a6c3d4 am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 by Gloria Wang · 14 years ago
  13. 07e9267 Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 by Gloria Wang · 14 years ago
  14. 5a79cfd am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 by Mike Lockwood · 14 years ago
  15. fbfe555 StorageVolume: Add getStorageId() accessor by Mike Lockwood · 14 years ago
  16. bf81d4b am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 by Andreas Huber · 14 years ago
  17. c56e81c Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 by Andreas Huber · 14 years ago
  18. d90a2c4 am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 by Dianne Hackborn · 14 years ago
  19. 1e662c3 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 by Dianne Hackborn · 14 years ago
  20. e23639e am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 by Mike Lockwood · 14 years ago
  21. b822d24 am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 by Mike Lockwood · 14 years ago
  22. ac8dea1 DO NOT MERGE. Integrate from master: Rework display size access. by Dianne Hackborn · 14 years ago
  23. 5169054 MTP: Have GetStorageInfo command return correct storage type for removable storage by Mike Lockwood · 14 years ago
  24. 2f6a388 StorageManager: Clean up and generalize storage configuration resources by Mike Lockwood · 14 years ago
  25. 331de5d DO NOT MERGE For bug 4422428 Squashed commit of the following: by Gloria Wang · 14 years ago
  26. 77d8dc2 Using widevine:// to stream adaptive bitrate wvm content no longer by Andreas Huber · 14 years ago
  27. 158e358 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 by The Android Automerger · 14 years ago
  28. 0d560d4 am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1 by Scott Main · 14 years ago
  29. 0cdd9f7 docs: add package description for mtp and a little more info to MtpDevice by Scott Main · 14 years ago
  30. b1071331c DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2 by Andreas Huber · 14 years ago
  31. 36132a4 DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() by Mike Lockwood · 14 years ago
  32. 8b1c74f DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic by Mike Lockwood · 14 years ago
  33. a792c80 DO NOT MERGE MTP: Implement GetThumb command by Mike Lockwood · 14 years ago
  34. af50821 DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions by Mike Lockwood · 14 years ago
  35. fdb50e6 DO NOT MERGE MTP: Add extended operations to support in-place editing of files by Mike Lockwood · 14 years ago
  36. fb62326 DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider by Mike Lockwood · 14 years ago
  37. 7dd5922 DO NOT MERGE Fix media scanner uri handling. by Marco Nelissen · 14 years ago
  38. d3e4290c DO NOT MERGE MTP and media provider support for multiple storage devices: by Mike Lockwood · 14 years ago
  39. c56ad54 DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() by Mike Lockwood · 14 years ago
  40. 71b3342 DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic by Mike Lockwood · 14 years ago
  41. 710a206 DO NOT MERGE MTP: Implement GetThumb command by Mike Lockwood · 14 years ago
  42. 7fc3beb DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions by Mike Lockwood · 14 years ago
  43. 371279f DO NOT MERGE MTP: Add extended operations to support in-place editing of files by Mike Lockwood · 14 years ago
  44. 9c112a8 DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider by Mike Lockwood · 14 years ago
  45. 1cf74fb DO NOT MERGE Fix media scanner uri handling. by Marco Nelissen · 14 years ago
  46. 7ae938be DO NOT MERGE MTP and media provider support for multiple storage devices: by Mike Lockwood · 14 years ago
  47. f181e41 am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 14 years ago
  48. ec78f55 Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 14 years ago
  49. 34cd123 am b0d6f10e: Bug 4167061 remove debugging code by Glenn Kasten · 14 years ago
  50. b0d6f10 Bug 4167061 remove debugging code by Glenn Kasten · 14 years ago
  51. 87ee132 am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2) by Glenn Kasten · 14 years ago
  52. c6c2285b3 Enable HDCP debugging in Stagefright (1 of 2) by Glenn Kasten · 14 years ago
  53. 3a9f514 am 66380f76: Stagefright: authenticate ANativeWindow. by Jamie Gennis · 14 years ago
  54. 66380f7 Stagefright: authenticate ANativeWindow. by Jamie Gennis · 14 years ago
  55. 38f04c0 am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support. by Mike Lockwood · 14 years ago
  56. 11dd5ae Improve Javadoc for USB Manager and MTP/PTP support. by Mike Lockwood · 14 years ago
  57. 4ed59de am ffa670b5: Bug 4167061 by Glenn Kasten · 14 years ago
  58. ffa670b Bug 4167061 by Glenn Kasten · 14 years ago
  59. 06ac039 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 by Andreas Huber · 14 years ago
  60. b676b73 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 by Andreas Huber · 14 years ago
  61. 45ad57a When http streaming and Content-Length is unknown, make sure to return all by Andreas Huber · 14 years ago
  62. 8de5df4 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 by Andreas Huber · 14 years ago
  63. b13c4a9 Surfaceflinger expects rectangles to be specified right/bottom edge exclusive. by Andreas Huber · 14 years ago
  64. e7cedad am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 by Andreas Huber · 14 years ago
  65. 2edbdcc Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 by Andreas Huber · 14 years ago
  66. 59529e1 After a seek there's a brief period where audio time isn't reestablished. by Andreas Huber · 14 years ago
  67. 2fee96b am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 by Andreas Huber · 14 years ago
  68. 16ede3c Make sure we post a video event when seeking after seeing video EOS before. by Andreas Huber · 14 years ago
  69. 9fb9823 am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 by James Dong · 14 years ago
  70. 3be1593 Switch to use SF cached source by James Dong · 14 years ago
  71. 503f4da am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  72. 0b1b2a3 Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 by Glenn Kasten · 14 years ago
  73. 1b11b64 Bug 4159373 Use HDCP debug settings by Glenn Kasten · 14 years ago
  74. a450ef0 am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1 by shailendra · 14 years ago
  75. ac390b8 Merge "Fix for Media Server memory leak" into honeycomb-mr1 by shailendra · 14 years ago
  76. 2d06aee Fix for Media Server memory leak by shailendra · 14 years ago
  77. b819dcd am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 by shailendra · 14 years ago
  78. 8483073 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 by shailendra · 14 years ago
  79. 3da1072 am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 by Andreas Huber · 14 years ago
  80. 453c0d5 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 by Andreas Huber · 14 years ago
  81. 112852b am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 by Yu Shan Emily Lau · 14 years ago
  82. 0210997 Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 by Yu Shan Emily Lau · 14 years ago
  83. 8505f2f DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue. by Andreas Huber · 14 years ago
  84. 970d7dd am e2c32e9f: If nothing is to be copied, return right away. by Andreas Huber · 14 years ago
  85. e2c32e9 If nothing is to be copied, return right away. by Andreas Huber · 14 years ago
  86. 75afb97 Add the mem logging into test utility. Bug# 4108259 by Yu Shan Emily Lau · 14 years ago
  87. a5eaf2e am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 by shailendra · 14 years ago
  88. d0c2813 Fix for testPropertiesWMVFile case failed with build HMI75B(4128259) by shailendra · 14 years ago
  89. 0d922ec Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 by shailendra · 14 years ago
  90. c8b4efd Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235) by shailendra · 14 years ago
  91. 9c0c5b5 am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 14 years ago
  92. 2f1f224 Fix missing AOSP copyright headers for a bunch of media framework files by James Dong · 14 years ago
  93. c97022e am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  94. a3f8514 MtpServer: Do not attempt to stop MTP if it has not been started by Mike Lockwood · 14 years ago
  95. 797f5b0 am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 by Yu Shan Emily Lau · 14 years ago
  96. fd5c1f7 Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 by Yu Shan Emily Lau · 14 years ago
  97. 9dab7847 Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. by Yu Shan Emily Lau · 14 years ago
  98. 69d0549 am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  99. 0edefea Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 by Rajneesh Chowdury · 14 years ago
  100. 28fc203 am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 by James Dong · 14 years ago