summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 3ce4f3d0 to masterElliott Hughes2014-04-281-4/+3
|\
| * am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."Elliott Hughes2014-04-281-4/+3
| |\
| | * Track libcore.os' move to android.system.Elliott Hughes2014-04-281-4/+3
* | | Merge "ImageReader: remove RAW_SENSOR format translation"Zhijun He2014-04-251-7/+1
|\ \ \
| * | | ImageReader: remove RAW_SENSOR format translationZhijun He2014-04-241-7/+1
* | | | am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resour...Marco Nelissen2014-04-251-0/+13
|\ \ \ \ | | |/ / | |/| |
| * | | am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources"Marco Nelissen2014-04-251-0/+13
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Release DrmManagerClient resources"Marco Nelissen2014-04-251-0/+13
| | |\ \
| | | * | Release DrmManagerClient resourcesMattias Nilsson2014-04-151-0/+13
* | | | | Merge "camera2: Add DNG creator class."Ruben Brunk2014-04-251-0/+254
|\ \ \ \ \
| * | | | | camera2: Add DNG creator class.Ruben Brunk2014-04-241-0/+254
| | |_|_|/ | |/| | |
* | | | | camera2: Fix broken camera metadata test due to key renameIgor Murashkin2014-04-221-1/+1
* | | | | Merge "Remove VideoEditor"Lajos Molnar2014-04-2251-33643/+1
|\ \ \ \ \
| * | | | | Remove VideoEditorLajos Molnar2014-04-2151-33643/+1
* | | | | | PlayerRecord: remove obsolete accessorsJean-Michel Trivi2014-04-221-12/+0
* | | | | | Merge "MediaFocusControl: priority to playing players for media button"Jean-Michel Trivi2014-04-222-95/+134
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | MediaFocusControl: priority to playing players for media buttonJean-Michel Trivi2014-04-222-95/+134
* | | | | | 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