1. 4afda1e Merge "Revert "Update drm hal to find drm@1.1 factories"" by TreeHugger Robot · 7 years ago
  2. d3eece8 Revert "Update drm hal to find drm@1.1 factories" by Tobias Thierer · 7 years ago
  3. 1a099eb [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd ski skipped: 7e571e4cb9 am: a28856d4cf -s ours am: 6579d3cdc0 -s ours am: 291daf4507 -s ours by Pawin Vongmasa · 7 years ago
  4. 4051b1c [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd ski skipped: 7e571e4cb9 am: a28856d4cf -s ours am: 6579d3cdc0 -s ours by Pawin Vongmasa · 7 years ago
  5. 291daf4 [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd ski skipped: 7e571e4cb9 am: a28856d4cf -s ours by Pawin Vongmasa · 7 years ago
  6. 6579d3c [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd ski skipped: 7e571e4cb9 by Pawin Vongmasa · 7 years ago
  7. a28856d [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd ski skipped: 7e571e4cb9 by Android Build Merger (Role) · 7 years ago
  8. 7e571e4 [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd skipped: 59c9333550 by Android Build Merger (Role) · 7 years ago
  9. 59c9333 [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd by Android Build Merger (Role) · 7 years ago
  10. 15c0925 [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 by Android Build Merger (Role) · 7 years ago
  11. 991a84f [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 by Android Build Merger (Role) · 7 years ago
  12. c3762fa [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 by Android Build Merger (Role) · 7 years ago
  13. 9b8f9d3 [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 by Android Build Merger (Role) · 7 years ago
  14. 842144c [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 by Android Build Merger (Role) · 7 years ago
  15. 099f0d7 [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba by Android Build Merger (Role) · 7 years ago
  16. fd3a46a [automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 by Android Build Merger (Role) · 7 years ago
  17. 3382ea7 Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into oc-dev am: 695442be2d -s ours am: f39e35e6ae -s ours am: a5115e25ef -s ours by Pawin Vongmasa · 7 years ago
  18. 9e6bf25 Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into oc-dev am: 695442be2d -s ours am: f39e35e6ae -s ours by Pawin Vongmasa · 7 years ago
  19. a5115e2 Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into oc-dev am: 695442be2d -s ours by Pawin Vongmasa · 7 years ago
  20. f39e35e Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into oc-dev by Pawin Vongmasa · 7 years ago
  21. 8eb1e62 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 am: 396648d2e1 am: 518eb4c707 skipped: 3fdbeb8e1a am: 5de246edcb -s ours am: 7d8e376006 -s ours am: 83ff6b7934 -s ours by Pawin Vongmasa · 7 years ago
  22. 695442b Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into oc-dev by TreeHugger Robot · 7 years ago
  23. a6bcc0d Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  24. 61ca195 Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into cw-f-dev by TreeHugger Robot · 7 years ago
  25. 5d9229c Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into nyc-mr1-dev by TreeHugger Robot · 7 years ago
  26. 1bbef63 Merge "RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free" into nyc-dev by TreeHugger Robot · 7 years ago
  27. ed96964 Merge changes from topic "am-b13a1f4c-8656-492a-ba4c-6b204a543b93" into nyc-dr1-dev by TreeHugger Robot · 7 years ago
  28. 2eea7ca [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 am: 396648d2e1 am: 518eb4c707 skipped: 3fdbeb8e1a am: 5de246edcb -s ours am: 7d8e376006 -s ours by Pawin Vongmasa · 7 years ago
  29. 83ff6b7 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 am: 396648d2e1 am: 518eb4c707 skipped: 3fdbeb8e1a am: 5de246edcb -s ours by Pawin Vongmasa · 7 years ago
  30. 7d8e376 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 am: 396648d2e1 am: 518eb4c707 skipped: 3fdbeb8e1a by Pawin Vongmasa · 7 years ago
  31. 0f2451f Merge "RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free" into mnc-dev by TreeHugger Robot · 7 years ago
  32. 5de246e [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 am: 396648d2e1 am: 518eb4c707 skipped: 3fdbeb8e1a by Android Build Merger (Role) · 7 years ago
  33. 3fdbeb8 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 am: 396648d2e1 am: 518eb4c707 by Android Build Merger (Role) · 7 years ago
  34. 518eb4c [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 am: 396648d2e1 by Android Build Merger (Role) · 7 years ago
  35. 396648d [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c am: 241f1e1f74 by Android Build Merger (Role) · 7 years ago
  36. 241f1e1 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c by Android Build Merger (Role) · 7 years ago
  37. 906aa68 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 by Android Build Merger (Role) · 7 years ago
  38. 4495da6 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b by Android Build Merger (Role) · 7 years ago
  39. 9c02eb2 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e by Android Build Merger (Role) · 7 years ago
  40. 2b9a422 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 by Android Build Merger (Role) · 7 years ago
  41. 5e6b803 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: c7fe16530e am: 769fd6af7e am: 3920861bf9 am: 90acdd39d2 skipped: f5977f0110 by Android Build Merger (Role) · 7 years ago
  42. f5977f0 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: c7fe16530e am: 769fd6af7e am: 3920861bf9 am: 90acdd39d2 by Android Build Merger (Role) · 7 years ago
  43. 90acdd3 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: c7fe16530e am: 769fd6af7e am: 3920861bf9 by Android Build Merger (Role) · 7 years ago
  44. 3920861 [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: c7fe16530e am: 769fd6af7e by Android Build Merger (Role) · 7 years ago
  45. 769fd6a [automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: c7fe16530e by Android Build Merger (Role) · 7 years ago
  46. fa84ada Merge "Fix MediaDrm security level APIs" by TreeHugger Robot · 7 years ago
  47. d0e0b1a Merge "MediaPlayer2: hook up srcId." by TreeHugger Robot · 7 years ago
  48. 913f986 Merge changes I55e18e2e,Id3687d2a,I9fb550a9 by TreeHugger Robot · 7 years ago
  49. 51fbf99 Merge "Update drm hal to find drm@1.1 factories" by TreeHugger Robot · 7 years ago
  50. 77881cd fix audio port ID generation for new AudioTrack and AudioRecord by Eric Laurent · 7 years ago
  51. 7dca8a8 Revert "Revert "audio flinger: move record permission checks to audio policy service"" by Eric Laurent · 8 years ago
  52. fee1976 Revert "Revert "audio policy: refactor audio record APIs"" by Eric Laurent · 8 years ago
  53. ceeee83 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 am: 9f344e0b9c am: 6e2df031fa am: 8d6c333529 am: 69ae15f2b5 am: 07fc61f790 am: 9d1cb8082d by Robert Shih · 7 years ago
  54. 2f3c3ec [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 am: 9f344e0b9c am: 6e2df031fa am: 8d6c333529 am: 69ae15f2b5 am: 07fc61f790 by Robert Shih · 7 years ago
  55. 9d1cb80 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 am: 9f344e0b9c am: 6e2df031fa am: 8d6c333529 am: 69ae15f2b5 by Robert Shih · 7 years ago
  56. 07fc61f [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 am: 9f344e0b9c am: 6e2df031fa am: 8d6c333529 by Robert Shih · 7 years ago
  57. d2bb1bd MediaPlayer2: hook up srcId. by Wei Jia · 7 years ago
  58. 69ae15f [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 am: 9f344e0b9c am: 6e2df031fa am: 8d6c333529 by Android Build Merger (Role) · 7 years ago
  59. 8d6c333 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 am: 9f344e0b9c am: 6e2df031fa by Android Build Merger (Role) · 7 years ago
  60. 6e2df03 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 am: 9f344e0b9c by Android Build Merger (Role) · 7 years ago
  61. 9f344e0 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 am: 67835c7025 by Android Build Merger (Role) · 7 years ago
  62. 67835c7 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 am: e31e750544 by Android Build Merger (Role) · 7 years ago
  63. e31e750 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 am: 86eb461699 by Android Build Merger (Role) · 7 years ago
  64. 86eb461 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 am: 1816776c89 by Android Build Merger (Role) · 7 years ago
  65. 1816776 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 am: a6bd71fcb8 by Android Build Merger (Role) · 7 years ago
  66. a6bd71f [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f am: 4b29913d94 by Android Build Merger (Role) · 7 years ago
  67. 4b29913 [automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am: f3e0afb82f by Android Build Merger (Role) · 7 years ago
  68. f3e0afb M3UParser: detect variant streams without EXT-X-STREAM-INF by Robert Shih · 7 years ago
  69. 7a498a9 Merge "Refactor MediaPlayerBase's notify" into oc-dev am: 01970bf6fb am: 5c7f325b00 am: d7baca3dbb by Pawin Vongmasa · 7 years ago
  70. dd9010c Merge "Refactor MediaPlayerBase's notify" into oc-dev am: 01970bf6fb am: 5c7f325b00 by Pawin Vongmasa · 7 years ago
  71. d7baca3 Merge "Refactor MediaPlayerBase's notify" into oc-dev am: 01970bf6fb by Pawin Vongmasa · 7 years ago
  72. 5c7f325 Merge "Refactor MediaPlayerBase's notify" into oc-dev am: 01970bf6fb by Pawin Vongmasa · 7 years ago
  73. 01970bf Merge "Refactor MediaPlayerBase's notify" into oc-dev by TreeHugger Robot · 7 years ago
  74. 97df29e Fix bad assumptions around architectures by Greg Hartman · 7 years ago
  75. 04696f7 Merge "Use @include for crash_dump seccomp policies." by TreeHugger Robot · 7 years ago
  76. 98c1570 Merge "Revert "APM: Avoid route change mute of isolated sounds"" by TreeHugger Robot · 7 years ago
  77. ec8d39d Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev am: b9d90149a9 am: 8347d50e63 am: ef977699de by Santhosh Behara · 7 years ago
  78. b9c3d19 Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev am: b9d90149a9 am: 8347d50e63 by Santhosh Behara · 7 years ago
  79. ef97769 Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev am: b9d90149a9 by Santhosh Behara · 7 years ago
  80. 3cb0605 Merge "Pull out commonly used constants to <audio_utils/clock.h>" by Glenn Kasten · 7 years ago
  81. 8347d50 Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev by Santhosh Behara · 7 years ago
  82. b9d9014 Merge "libmedia: Fix null pointer crash in secure buffer allocation." into oc-dev by TreeHugger Robot · 7 years ago
  83. 7e193a1 Merge "NuPlayer2: add srcId for source." by TreeHugger Robot · 7 years ago
  84. 72bf2a0 NuPlayer2: add srcId for source. by Wei Jia · 7 years ago
  85. 4a5b481 Revert "APM: Avoid route change mute of isolated sounds" by Jean-Michel Trivi · 7 years ago
  86. bffc646 Merge "link media.metrics native strings to api-controlled java strings" by TreeHugger Robot · 7 years ago
  87. 9413a20 Merge "MediaSession2: Make PlaybackInfoProvider inner interface" by TreeHugger Robot · 7 years ago
  88. 0cc3c6f Merge "kVersionValue in clearkey service 1.1 should return 1.1." by Edwin Wong · 7 years ago
  89. a3c7791 Update drm hal to find drm@1.1 factories by Jeff Tinker · 7 years ago
  90. de15b8c link media.metrics native strings to api-controlled java strings by Ray Essick · 8 years ago
  91. a2544c5 [automerger] Check NAL size before looking inside am: e0c020969d am: 8c4ae8057c am: 767a82a9d6 am: f7d9bba9b1 am: e04b7c8c06 am: 25e199f787 am: 93962ef505 am: 714148f6eb am: b6fdd7ee95 am: 3631c04dfa am: 68adda01b0 am: 68e58ff3bd am: 078f1de778 am: a1f05a7197 by Ray Essick · 7 years ago
  92. 5d05c38 [automerger] Check NAL size before looking inside am: e0c020969d am: 8c4ae8057c am: 767a82a9d6 am: f7d9bba9b1 am: e04b7c8c06 am: 25e199f787 am: 93962ef505 am: 714148f6eb am: b6fdd7ee95 am: 3631c04dfa am: 68adda01b0 am: 68e58ff3bd am: 078f1de778 by Ray Essick · 7 years ago
  93. a1f05a7 [automerger] Check NAL size before looking inside am: e0c020969d am: 8c4ae8057c am: 767a82a9d6 am: f7d9bba9b1 am: e04b7c8c06 am: 25e199f787 am: 93962ef505 am: 714148f6eb am: b6fdd7ee95 am: 3631c04dfa am: 68adda01b0 am: 68e58ff3bd by Ray Essick · 7 years ago
  94. 078f1de [automerger] Check NAL size before looking inside am: e0c020969d am: 8c4ae8057c am: 767a82a9d6 am: f7d9bba9b1 am: e04b7c8c06 am: 25e199f787 am: 93962ef505 am: 714148f6eb am: b6fdd7ee95 am: 3631c04dfa am: 68adda01b0 by Ray Essick · 7 years ago
  95. c64ab43 Merge "MediaPlayer2: uid is always valid." by TreeHugger Robot · 7 years ago
  96. a04be48 Merge "Camera: parse preview fps and fps range correctly" am: 4d9abd9392 am: 35be00e8e6 by Gigon Bae · 7 years ago
  97. 6d0b708 Merge "Camera: parse preview fps and fps range correctly" am: 4d9abd9392 by Gigon Bae · 7 years ago
  98. 35be00e Merge "Camera: parse preview fps and fps range correctly" am: 4d9abd9392 by Gigon Bae · 7 years ago
  99. 4d9abd9 Merge "Camera: parse preview fps and fps range correctly" by Treehugger Robot · 7 years ago
  100. 991a25e MediaSession2: Make PlaybackInfoProvider inner interface by Jaewan Kim · 7 years ago