summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge "TIF: Add TvInputInfo.isHardwareInput()."Dongwon Kang2015-03-191-8/+25
|\ \
| * | TIF: Add TvInputInfo.isHardwareInput().Dongwon Kang2015-03-121-8/+25
* | | TIF: Add a missing comment for the return value of onSelectTrack()Jae Seo2015-03-171-19/+21
* | | 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
* | | | 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
* | | | | 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
* | | | | 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
* | | | | MidiDeviceInfo: Fix NPE for devices with no port namesMike Lockwood2015-03-161-2/+10
* | | | | am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer comp...Andreas Gampe2015-03-163-5/+7
|\ \ \ \ \
| * | | | | Frameworks/base: Use equals for Integer comparisonAndreas Gampe2015-03-153-5/+7
* | | | | | Merge "media: add MediaFormat.KEY_PRIORITY."Ronghua Wu2015-03-161-0/+19
|\ \ \ \ \ \
| * | | | | | media: add MediaFormat.KEY_PRIORITY.Ronghua Wu2015-03-141-0/+19
* | | | | | | Merge "Add MidiManager to public API"Mike Lockwood2015-03-149-76/+60
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add MidiManager to public APIMike Lockwood2015-03-139-76/+60
* | | | | | | Merge "VolumePolicy: Debounce adjustments from vibrate->silent."John Spurlock2015-03-131-4/+19
|\ \ \ \ \ \ \
| * | | | | | | VolumePolicy: Debounce adjustments from vibrate->silent.John Spurlock2015-03-131-4/+19
* | | | | | | | Merge "MidiDeviceInfo meta-data improvements:"Mike Lockwood2015-03-133-13/+108
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | MidiDeviceInfo meta-data improvements:Mike Lockwood2015-03-123-13/+108
| | |_|_|_|/ | |/| | | |
* | | | | | AudioService: Define minimum levels for volume streams.John Spurlock2015-03-132-0/+20
* | | | | | Merge "Volume policy updates."John Spurlock2015-03-135-5/+108
|\ \ \ \ \ \
| * | | | | | Volume policy updates.John Spurlock2015-03-125-5/+108
* | | | | | | resolved conflicts for merge of 42f55d1e to masterMarco Nelissen2015-03-121-31/+34
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix context leakMarco Nelissen2015-03-111-35/+44
* | | | | | | Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager."Ronghua Wu2015-03-121-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | drm: add EVENT_SESSION_RECLAIMED for resource manager.Ronghua Wu2015-03-041-0/+6
* | | | | | | AudioService: Write base stream volume changes to the event log.John Spurlock2015-03-123-9/+11
| |_|/ / / / |/| | | | |
* | | | | | Merge "MidiManager: Add MIDI device status notifications"Mike Lockwood2015-03-118-15/+287
|\ \ \ \ \ \
| * | | | | | MidiManager: Add MIDI device status notificationsMike Lockwood2015-03-118-15/+287
* | | | | | | Merge "MidiDevice: Add support for making direct connections between ports"Mike Lockwood2015-03-114-3/+98
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MidiDevice: Add support for making direct connections between portsMike Lockwood2015-03-114-3/+98
* | | | | | | Merge "Add MidiReceiver.send() and MidiReceiver.getMaxMessageSize()"Mike Lockwood2015-03-114-13/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add MidiReceiver.send() and MidiReceiver.getMaxMessageSize()Mike Lockwood2015-03-114-13/+47
| | |_|_|/ / | |/| | | |
* | | | | | am debf5a09: am c2826fb9: am 3d333c74: Merge "Fix typos in AudioManager javadoc"Narayan Kamath2015-03-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 3d333c74: Merge "Fix typos in AudioManager javadoc"Narayan Kamath2015-03-101-1/+1
| |\ \ \ \
| | * | | | Fix typos in AudioManager javadocEemi Haukkala2015-03-101-1/+1
* | | | | | Merge "MIDI Manager changes:"Mike Lockwood2015-03-107-53/+112
|\ \ \ \ \ \
| * | | | | | MIDI Manager changes:Mike Lockwood2015-03-097-53/+112
* | | | | | | Merge "Add DEPTH image formats, support in ImageReader"Eino-Ville Talvala2015-03-101-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-091-0/+2
| |/ / / / / /
* | | | | | | enable FM tuner and hotword capture for system apps.Eric Laurent2015-03-093-9/+13
|/ / / / / /
* | | | | | MIDI Manager: Add explicit close mechanism for input and output portsMike Lockwood2015-03-065-47/+172
* | | | | | MidiDeviceService: Add getDeviceInfo() accessor methodMike Lockwood2015-03-062-2/+14
* | | | | | Add MidiDevice.close() method so we can clean up our ServiceConnectionMike Lockwood2015-03-042-7/+29
* | | | | | Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post()...Mike Lockwood2015-03-046-42/+32