summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Move MIDI utilities for internal use to com.android.internal.midi packageMike Lockwood2015-03-303-84/+4
| | | | Change-Id: I7393ae1d4bca61667fb6ee809a7aa22c5c48de56
* Merge "AudioService: Observe changes to output devices per-stream."John Spurlock2015-03-271-0/+28
|\
| * AudioService: Observe changes to output devices per-stream.John Spurlock2015-03-261-0/+28
| | | | | | | | | | | | | | | | | | | | - Keep track of calls to AudioSystem.getDevicesForStream. - Report device changes for the base streams to the binary event log. - Fire internal intent so volume UI can respond to changes. - Update devices when new routes are reported. Bug: 19618959 Change-Id: I7bbd497b178d9829accc19e6c951a711aef8590c
* | Merge "Fix a few found doc problems."John Spurlock2015-03-272-5/+5
|\ \
| * | Fix a few found doc problems.John Spurlock2015-03-242-5/+5
| |/ | | | | | | Change-Id: I98567f4a0fc96f501c00bf361688e2c55232f78d
* | Merge "AudioRecord builder"Jean-Michel Trivi2015-03-262-4/+169
|\ \
| * | AudioRecord builderJean-Michel Trivi2015-03-252-4/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add public and system APIs for building an AudioRecord instance. The validity of the combination of parameters is verified at "build" time. Bug 19699343 Change-Id: If959f0f35208fb81a902364aaeefc1ebef1a4d23
* | | Added MediaDescription#getMediaUri.P.Y. Laligand2015-03-251-2/+30
| | | | | | | | | | | | | | | | | | b/19622238 Change-Id: Ic5f14a2bfc8db986249b8d2522a476a9107748bb
* | | Added MediaController.TransportControls#playFromUri.P.Y. Laligand2015-03-255-6/+67
|/ / | | | | | | | | | | b/19622238 Change-Id: I75d6258ccafb2266d5f8bdf3a279b3a2e9ef2bbf
* | Merge "Make TvInputService skip to dispatch media keys to an overlay view"Youngsang Cho2015-03-251-2/+10
|\ \ | |/ |/|
| * Make TvInputService skip to dispatch media keys to an overlay viewYoungsang Cho2015-03-251-2/+10
| | | | | | | | | | | | | | | | | | | | If media keys are dispatched to an overlay view, it is always consumed because of fallback logic. Therefore, TvInputService skips to dispatch media keys to an overlay view in order to return the keys back to an application. Bug: 18195249 Change-Id: I1cb4c9de5a73bd741ab64b1b85e9c986a1a92a90
* | Remove the ability to disable audio service.John Spurlock2015-03-243-456/+227
| | | | | | | | | | | | | | | | | | Running in a configuration without audio service is not fully tested. Remove the configuration option for now. Also remove unused delegation layer in SoundPool. Bug: 19891112 Change-Id: I47be0e32d54b8ef8fa25cf47b85eacf8a4969500
* | Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs"Dongwon Kang2015-03-241-0/+44
|\ \
| * | TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.ProgramsDongwon Kang2015-03-231-0/+44
| | | | | | | | | | | | | | | | | | | | | These flags are expected to be used for TV input's internal purpose. Bug: 19190140 Change-Id: Ie45a582287a83abdbecb129f5c03cc166f617776
* | | Merge "Note in docs that MediaDrm methods throw IllegalStateException"Jeff Tinker2015-03-241-1/+4
|\ \ \
| * | | Note in docs that MediaDrm methods throw IllegalStateExceptionJeff Tinker2015-03-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes incorrect documention where ResourceBusyException can't be thrown bug: 18285793 Change-Id: I52d782a772aed97d32e70d7505c48540a320ca07
* | | | Merge "Report key request message type for unprefixed EME"Jeff Tinker2015-03-242-3/+59
|\ \ \ \
| * | | | Report key request message type for unprefixed EMEJeff Tinker2015-03-232-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 19771299 Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
* | | | | Merge "TIF: fix NPE in the case a hardware TV input is not ready to use."Dongwon Kang2015-03-231-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | TIF: fix NPE in the case a hardware TV input is not ready to use.Dongwon Kang2015-03-231-1/+2
| | |/ / | |/| | | | | | | | | | | | | | Bug: 19805327 Change-Id: I0c96ab9274ea2404d75b02205ef40f56fb4552f6
* | | | Merge "media: fix build break"Zhijun He2015-03-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | media: fix build breakZhijun He2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | clang/llvm complains the timestamp print formating. Change-Id: Ie4bff9cbec90994709097d087d1c1f2a7d1465cf
* | | | camera2: Remove ProCamera.Ruben Brunk2015-03-201-26/+0
|/ / / | | | | | | | | | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* | | ImageReader/Writer: Add ImageWriter and Opaque ImageReaderZhijun He2015-03-208-10/+2211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ImageWriter/Reader API change, including below changes * Interface for Opaque ImageReader * ImageWriter Interface and implementation * Image class minor update to support ImageWriter opaque ImageReader detach/attach interface are defined but yet to be implemented. Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
* | | Merge "Camera: update createStream API to add new rotation field"Yin-Chia Yeh2015-03-191-6/+10
|\ \ \
| * | | Camera: update createStream API to add new rotation fieldYin-Chia Yeh2015-03-161-6/+10
| | | | | | | | | | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | | | Merge "fix return from finally"Eric Laurent2015-03-194-8/+4
|\ \ \ \
| * | | | fix return from finallyEric Laurent2015-03-184-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19709617. Change-Id: I2c2e6ebe876e0e7e814554fa2ffc89551b3165b2
* | | | | Merge "MidiDeviceInfo: Add constants for future Bluetooth MIDI support"Mike Lockwood2015-03-191-0/+12
|\ \ \ \ \
| * | | | | MidiDeviceInfo: Add constants for future Bluetooth MIDI supportMike Lockwood2015-03-191-0/+12
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Id89b691e923b9de8e5dce58527ba38e28e8e1d36
* | | | | Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract"Dongwon Kang2015-03-191-0/+44
|\ \ \ \ \
| * | | | | TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContractDongwon Kang2015-03-181-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These flags are expected to be used for TV input's internal purpose. Bug: 19382355, Bug: 19190140 Change-Id: I1a6c224fc9e4d254a224f47407ba4a77b8f54d57
* | | | | | Merge "TIF: Add TvInputInfo.isHardwareInput()."Dongwon Kang2015-03-191-8/+25
|\ \ \ \ \ \
| * | | | | | TIF: Add TvInputInfo.isHardwareInput().Dongwon Kang2015-03-121-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this method, the system apps like Launcher and TV will have a concrete way to detect the built-in tuner input. Bug: 18474316 Change-Id: I0e60fa54ed676656212c40fdf6e936c3ff6c567e
* | | | | | | TIF: Add a missing comment for the return value of onSelectTrack()Jae Seo2015-03-171-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19630395 Change-Id: I2caa9ace23ee003e9662e363538a363ae9a0ced7
* | | | | | | Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""Andy Hung2015-03-171-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "soundpool: update sample rate when reusing audiotrack""Andy Hung2015-03-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b801f73343194cd081f675a5dc2b3e90959cf6d1. Change-Id: I0f6ee7fc981d65040f32e7852a5f66fd391b329d
* | | | | | | | Merge "Revert "Revert "soundpool: reuse channel for same sample if available"""Andy Hung2015-03-172-34/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Revert "soundpool: reuse channel for same sample if available""Andy Hung2015-03-172-34/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc. Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3
* | | | | | | | | Merge "Audio: Flag volume adjustments from hardware keys."John Spurlock2015-03-172-4/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Audio: Flag volume adjustments from hardware keys.John Spurlock2015-03-172-4/+11
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19793279 Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc
* | | | | | | | | Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"Ruben Brunk2015-03-171-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | camera2: Release surface in ImageReader#close and fix legacy cleanupRuben Brunk2015-03-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19694090 Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
* | | | | | | | | | Merge "Deprecate redundant event, should handle via NotProvisionedException"Jeff Tinker2015-03-171-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Deprecate redundant event, should handle via NotProvisionedExceptionJeff Tinker2015-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 12033385 Change-Id: I02103f3fd9f48f57113bb248891fc1c8f0d8a248
* | | | | | | | | Merge "TIF: Add getDescription() method to TvTrackInfo."Dongwon Kang2015-03-161-6/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | TIF: Add getDescription() method to TvTrackInfo.Dongwon Kang2015-03-111-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when language is not enough for describing the track. E.g. main audio track(eng) vs audio commentary(eng) Bug: 19302103 Change-Id: Iebffb943d2c0b5f7a7a12820ff3475b66e0130e8
* | | | | | | | | MidiDeviceInfo: Fix NPE for devices with no port namesMike Lockwood2015-03-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I703709f84b6b1951b67918c9762bb84a142d855c
* | | | | | | | | am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer ↵Andreas Gampe2015-03-163-5/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comparison" * commit 'c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0': Frameworks/base: Use equals for Integer comparison
| * \ \ \ \ \ \ \ \ Merge "Frameworks/base: Use equals for Integer comparison"Andreas Gampe2015-03-163-5/+7
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-11-26 20:47:34 +0000