1. 0937897 resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp by Eric Laurent · 10 years ago
  2. 65bc112 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev by Eric Laurent · 10 years ago
  3. 584674c am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev by Michael Wright · 10 years ago
  4. 236dc2c am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev by Jeff Sharkey · 10 years ago
  5. c6de321 Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev by Michael Wright · 10 years ago
  6. 1102e71 Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev by Jeff Sharkey · 10 years ago
  7. 87d76f6 Throw IOException when missing default ringtone. by Jeff Sharkey · 10 years ago
  8. 28089cc Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 by Ruben Brunk · 10 years ago
  9. 3ef5033 Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev by Ruben Brunk · 10 years ago
  10. f32bd3c Don't try to scale the bitmaps for null MediaMetadata. by Michael Wright · 10 years ago
  11. f4a637d Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode. by Ruben Brunk · 10 years ago
  12. 9cfdb4f am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev by John Spurlock · 10 years ago
  13. 83d0c86 am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev by Jean-Michel Trivi · 10 years ago
  14. f062d8d am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev by Jeff Tinker · 10 years ago
  15. b22eea7 am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev by RoboErik · 10 years ago
  16. 0713f94 am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev by RoboErik · 10 years ago
  17. 46e18c1d am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev by Dongwon Kang · 10 years ago
  18. 967da50 am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  19. 795a514 Volume: Only play the new vibrate hint once per volume-down. by John Spurlock · 10 years ago
  20. 7f5eb9f AudioSystem JNI: Add audio policy custom mixes registration by Eric Laurent · 10 years ago
  21. 8638877 Merge "Support collaborative audio focus handling" into lmp-mr1-dev by Jean-Michel Trivi · 10 years ago
  22. 0212be5 Support collaborative audio focus handling by Jean-Michel Trivi · 10 years ago
  23. 846e712 Unhide secure stop APIs by Jeff Tinker · 10 years ago
  24. d386d0f Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev by RoboErik · 10 years ago
  25. 7c82ced Route mute key events through MediaSessionService by RoboErik · 10 years ago
  26. f58a9091 Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev by RoboErik · 10 years ago
  27. 670de6b Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev by Dongwon Kang · 10 years ago
  28. c0abc9c TIF: increase the time threshold for tune operation which was too harsh by Dongwon Kang · 10 years ago
  29. fd228a3 Make setting the session token in MediaBrowserService synchronous by RoboErik · 10 years ago
  30. e762f98 am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" by Chih-hung Hsieh · 10 years ago
  31. 610e288 media: allow full range of Vorbis sampling rates by Lajos Molnar · 10 years ago
  32. ccce6e0 Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" by Chih-hung Hsieh · 10 years ago
  33. c0ab108 am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev by Dongwon Kang · 10 years ago
  34. eb26c8e am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev by Michael Wright · 10 years ago
  35. b0bbaec Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev by Dongwon Kang · 10 years ago
  36. 7081a5d Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev by Michael Wright · 10 years ago
  37. 8e74a8a am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev by Jean-Michel Trivi · 10 years ago
  38. 57457b9 Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev by Jean-Michel Trivi · 10 years ago
  39. f2d68c8 am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  40. b076324 am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev by Dongwon Kang · 10 years ago
  41. b4355ec Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  42. 7cfe00f Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev by Dongwon Kang · 10 years ago
  43. 628e521 am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev by Sungsoo Lim · 10 years ago
  44. 5a7445b Merge "Missing Javadoc update while API review" into lmp-mr1-dev by Sungsoo Lim · 10 years ago
  45. 0fb8fbd am c8d1b107: am 217814bf: Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev by Zhijun He · 10 years ago
  46. 993f81e TIF: fix a race condition when TvInputManager is initialized by Dongwon Kang · 10 years ago
  47. e09dcdb ImageReader: free direct byte buffers once Image is returned by Zhijun He · 10 years ago
  48. 34c9ee1 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev by John Spurlock · 10 years ago
  49. 4b187a2 am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true. by Wally Yau · 10 years ago
  50. 21d68f4 Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev by John Spurlock · 10 years ago
  51. 336cdb4 audioservice: system audio control in master volume mode by Jinsuk Kim · 10 years ago
  52. 1b3541d AudioMix address and type, rule exclusion API, dynamic source by Jean-Michel Trivi · 10 years ago
  53. da39290 Set stream volume to max when userMasterVolume is set to true. by Wally Yau · 10 years ago
  54. bcc1087 Volume: Improve inline volume controls used in settings. by John Spurlock · 10 years ago
  55. 266143e TIF: call tune() in HardwareSession by Dongwon Kang · 10 years ago
  56. 4e389e5 Missing Javadoc update while API review by Sungsoo Lim · 10 years ago
  57. f657463 am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  58. bc3226e Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev by Jinsuk Kim · 10 years ago
  59. 0eaee60 am 9bde6e41: am a181da10: Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  60. 1e88cf0 Fix broken @see javadoc in android.media.* classes by Ryan Lothian · 10 years ago
  61. e356600 am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev by Andy Hung · 10 years ago
  62. 24a9ddd am 29722231: am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev by Eric Laurent · 10 years ago
  63. d4604b4 am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  64. a2decb0 am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev by John Spurlock · 10 years ago
  65. 57d766f Do not perform forceVolumeControlStream in master volume mode by Jinsuk Kim · 10 years ago
  66. f32d06d Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev by Andy Hung · 10 years ago
  67. e511ddc Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev by Eric Laurent · 10 years ago
  68. 3ed95fe Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  69. d7572b8 am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" by chh · 10 years ago
  70. 243a42a am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch" by Chih-hung Hsieh · 10 years ago
  71. 351ab57 am a9031025: am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev by RoboErik · 10 years ago
  72. 661f2cf VolumeZen: Introduce internal vs external ringer mode. by John Spurlock · 10 years ago
  73. e19bb5c am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev by Jean-Michel Trivi · 10 years ago
  74. 5037f94 media: add support for 160-byte image info in MediaCodec by Lajos Molnar · 10 years ago
  75. 78bfa63 Allow set loop and position before write for static AudioTracks by Andy Hung · 10 years ago
  76. fc54573 Merge "Remove unused variables and functions, don't warn about unused parameters" by chh · 10 years ago
  77. 99d61ed Fix class vs. struct mismatch by Bernhard Rosenkränzer · 10 years ago
  78. d9bb296 Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev by RoboErik · 10 years ago
  79. d64c425 Delay calling onConnected until a session is set in MediaBrowser by RoboErik · 10 years ago
  80. 958876f Add support for audio focus locking by Jean-Michel Trivi · 10 years ago
  81. 0b10f9c am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  82. 57f6372 Add -Wno-unused-parameter to LOCAL_CFLAGS by Bernhard Rosenkränzer · 10 years ago
  83. 4048a4b Remove unused variables and functions, don't warn about unused parameters by Bernhard Rosenkränzer · 10 years ago
  84. 9e8d9ac Correctly iterate through MediaProjection callbacks. by Michael Wright · 10 years ago
  85. 307218c resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp by Andreas Gampe · 10 years ago
  86. ed368be Merge "Frameworks/base: Wall Werror in media/tests" by Andreas Gampe · 10 years ago
  87. c229c39 am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev by Jean-Michel Trivi · 10 years ago
  88. cfaac8d am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev by Jae Seo · 10 years ago
  89. 7d97be9d am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev by Jae Seo · 10 years ago
  90. bbf0f66 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev by RoboErik · 10 years ago
  91. 216c089 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev by RoboErik · 10 years ago
  92. a4fcb62 media: fix isSupportedFormat for integer frame rate by Lajos Molnar · 10 years ago
  93. 582bdf9 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." by Dan Albert · 10 years ago
  94. 09ff912 Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev by Jean-Michel Trivi · 10 years ago
  95. 8dc1031 Convert record channel mask for dynamic mix by Jean-Michel Trivi · 10 years ago
  96. 6698749 Add appropriate casts for char16_t. by Dan Albert · 10 years ago
  97. f66f305 Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev by Jae Seo · 10 years ago
  98. 52bfa33 Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev by Jae Seo · 10 years ago
  99. ac4af18b Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev by RoboErik · 10 years ago
  100. b9c87fb Scale bitmaps in metadata sent to the system by RoboErik · 10 years ago