summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when relea...Jeff Tinker2014-04-212-2/+10
|\
| * am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp...Jeff Tinker2014-04-212-2/+10
| |\
| | * Merge "Allow DRM plugins to be destroyed when released" into klp-modular-devJeff Tinker2014-04-212-2/+10
| | |\
| | | * Allow DRM plugins to be destroyed when releasedJeff Tinker2014-04-112-2/+10
* | | | am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
|\ \ \ \ | |/ / /
| * | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| |\ \ \ | | |/ /
| | * | am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | |\ \
| | | * | MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
* | | | | am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 3c8bbe24: Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
| | | |/ | | |/|
* | | | Add RouteProviders to the new Media APIsRoboErik2014-04-1735-474/+2547
* | | | Merge "media: don't rely on Java 6 parseInt error on leading '+' sign"Lajos Molnar2014-04-161-18/+19
|\ \ \ \
| * | | | media: don't rely on Java 6 parseInt error on leading '+' signLajos Molnar2014-04-161-18/+19
* | | | | am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-162-10/+13
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-162-10/+13
| |\ \ \
| | * | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-162-10/+13
* | | | | am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
| |\ \ \ \ | | |/ / /
| | * | | Remove code markersDmitriy Ivanov2014-04-152-34/+1
* | | | | Merge "Implement USB Audio across Nexus Devices Fix issues with connecting no...Paul McLean2014-04-111-14/+22
|\ \ \ \ \
| * | | | | Implement USB Audio across Nexus DevicesPaul McLean2014-04-111-14/+22
* | | | | | Merge "Revert "Revert "Initial implementation of USB Audio output."""Paul McLean2014-04-112-7/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "Revert "Initial implementation of USB Audio output.""Paul McLean2014-04-092-7/+25
* | | | | | am c2bd3687: am 70bba904: am b093e485: Merge "generateProjectThumbnail can fa...Elliott Hughes2014-04-111-3/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close o...Elliott Hughes2014-04-111-3/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "generateProjectThumbnail can fail to close output stream"Elliott Hughes2014-04-111-3/+5
| | |\ \ \ \
| | | * | | | generateProjectThumbnail can fail to close output streamHenrik Baard2013-07-111-3/+5
| * | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ...Jeff Tinker2014-04-033-42/+37
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-023-42/+37
* | | | | | | MediaFrameworkTest: Fix Camera2 API unit test build breakageZhijun He2014-04-102-37/+96
* | | | | | | Merge "MediaFocusControl: fix comment"Jean-Michel Trivi2014-04-101-4/+2
|\ \ \ \ \ \ \
| * | | | | | | MediaFocusControl: fix commentJean-Michel Trivi2014-04-101-4/+2
* | | | | | | | Camera2: Fix the JPEG format issuesZhijun He2014-04-091-19/+117
|/ / / / / / /
* | | | | | | Merge "Audio focus doesn't affect RemoteController"Jean-Michel Trivi2014-04-091-164/+101
|\ \ \ \ \ \ \
| * | | | | | | Audio focus doesn't affect RemoteControllerJean-Michel Trivi2014-04-081-164/+101
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "ImageReader: Fix raw buffer size calculation issue"Zhijun He2014-04-091-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | ImageReader: Fix raw buffer size calculation issueZhijun He2014-04-081-2/+4
* | | | | | | Revert "Initial implementation of USB Audio output."Eric Laurent2014-04-072-25/+7
|/ / / / / /
* | | | | | Merge "Simplify and document AudioTrack gain"Glenn Kasten2014-04-041-50/+67
|\ \ \ \ \ \
| * | | | | | Simplify and document AudioTrack gainGlenn Kasten2014-04-031-50/+67
* | | | | | | resolved conflicts for merge of 4f342e87 to masterJeff Tinker2014-04-033-42/+37
|/ / / / / /
* | | | | | Merge "camera2: Fix out-of-date metadata test"Igor Murashkin2014-04-012-2/+4
|\ \ \ \ \ \
| * | | | | | camera2: Fix out-of-date metadata testIgor Murashkin2014-04-012-2/+4
* | | | | | | am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" ...Jeff Tinker2014-04-0111-26/+490
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu...Jeff Tinker2014-04-0111-26/+490
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-0111-26/+490
* | | | | | | Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()"Lajos Molnar2014-04-011-0/+6
|\ \ \ \ \ \ \
| * | | | | | | MediaCodec: avoid silent array overflow in queueSecureInputBuffer()Lajos Molnar2014-03-251-0/+6
* | | | | | | | Merge "Don't ignore return value of setAuxEffectSendLevel()"Glenn Kasten2014-04-011-4/+4
|\ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-03 14:43:14 +0000