summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add MidiManager to public API"Mike Lockwood2015-03-149-76/+60
|\
| * Add MidiManager to public APIMike Lockwood2015-03-139-76/+60
* | am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm...Jeff Tinker2015-03-131-4/+16
|\ \
| * \ Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"Jeff Tinker2015-03-131-4/+16
| |\ \
| | * | Handle NULL keys and NULL values in MediaDrm JNI HashMapDaniel Broms2014-11-241-4/+16
* | | | 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-122-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | drm: add EVENT_SESSION_RECLAIMED for resource manager.Ronghua Wu2015-03-042-0/+12
* | | | | 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 "Revert "soundpool: reuse channel for same sample if available""Glenn Kasten2015-03-102-53/+34
|\ \ \ \ \ \
| * | | | | | Revert "soundpool: reuse channel for same sample if available"Glenn Kasten2015-03-092-53/+34
* | | | | | | Merge "Revert "soundpool: update sample rate when reusing audiotrack""Glenn Kasten2015-03-101-2/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Revert "soundpool: update sample rate when reusing audiotrack"Glenn Kasten2015-03-091-2/+0
| |/ / / / /
* | | | | | Merge "Fix SoundPool playback of multichannel files."Andy Hung2015-03-102-5/+7
|\ \ \ \ \ \
| * | | | | | Fix SoundPool playback of multichannel files.Andy Hung2015-03-062-5/+7
* | | | | | | Merge "Add DEPTH image formats, support in ImageReader"Eino-Ville Talvala2015-03-102-34/+34
|\ \ \ \ \ \ \
| * | | | | | | Add DEPTH image formats, support in ImageReaderEino-Ville Talvala2015-03-092-34/+34
* | | | | | | | Merge "enable FM tuner and hotword capture for system apps."Eric Laurent2015-03-103-9/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | enable FM tuner and hotword capture for system apps.Eric Laurent2015-03-093-9/+13
| | |/ / / / / | |/| | | | |
* | | | | | | Camera2: Remove unused parameters in ICameraDeviceUser#createStreamEino-Ville Talvala2015-03-091-10/+6
|/ / / / / /
* | | | | | Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468Mike Lockwood2015-03-0711-144/+275
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Eliminate MidiPort base class for MidiInputPort and MidiOutputPortMike Lockwood2015-03-043-59/+41
* | | | | | | Merge "media: update AMessage to use handler instead of handler-id"Lajos Molnar2015-03-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | media: update AMessage to use handler instead of handler-idLajos Molnar2015-03-041-1/+1
| |/ / / / / /
* | | | | | | Cleanup Bitmap JNI attempt #2John Reck2015-03-051-7/+1
* | | | | | | Merge "Revert "Cleanup Bitmap JNI""Chad Jones2015-03-051-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Revert "Cleanup Bitmap JNI"Chad Jones2015-03-051-1/+7