summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am bfea31fd: VolumeZen: Prevent raising ringer volume in silent mode.John Spurlock2014-06-012-9/+32
|\
| * VolumeZen: Prevent raising ringer volume in silent mode.John Spurlock2014-06-012-9/+32
* | am f2e19a36: Merge "AudioManager: add audio port gain control" into lmp-previ...Eric Laurent2014-05-313-1/+12
|\ \ | |/
| * Merge "AudioManager: add audio port gain control" into lmp-preview-devEric Laurent2014-05-313-1/+12
| |\
| | * AudioManager: add audio port gain controlEric Laurent2014-05-303-1/+12
* | | am b4499f84: Merge "audio routing update listener" into lmp-preview-devEric Laurent2014-05-312-2/+175
|\ \ \ | |/ /
| * | Merge "audio routing update listener" into lmp-preview-devEric Laurent2014-05-312-2/+175
| |\ \ | | |/
| | * audio routing update listenerEric Laurent2014-05-302-2/+175
* | | am 47615317: Merge "AudioSystem: added JNI for routing extensions" into lmp-p...Eric Laurent2014-05-312-5/+133
|\ \ \ | |/ /
| * | Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-devEric Laurent2014-05-312-5/+133
| |\ \ | | |/
| | * AudioSystem: added JNI for routing extensionsEric Laurent2014-05-302-5/+133
* | | am d99ebf8b: Merge "Fix name error in com.android.mediadrm.signer.xml" into l...Jeff Tinker2014-05-312-3/+4
|\ \ \ | |/ /
| * | Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-devJeff Tinker2014-05-312-3/+4
| |\ \
| | * | Fix name error in com.android.mediadrm.signer.xmlJeff Tinker2014-05-302-3/+4
* | | | am 7c9ed471: Merge changes I1fd178b6,I5093672e into lmp-preview-devLajos Molnar2014-05-301-2/+30
|\ \ \ \ | |/ / /
| * | | Merge changes I1fd178b6,I5093672e into lmp-preview-devLajos Molnar2014-05-301-2/+30
| |\ \ \
| | * | | DO NOT MERGE: media.MediaCodec: hide NotificationCallback listenerLajos Molnar2014-05-281-0/+5
| | * | | media.MediaCodec: document and fix-up setNotificationCallbackLajos Molnar2014-05-281-2/+25
| | | |/ | | |/|
* | | | am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-devRoboErik2014-05-3013-938/+719
|\ \ \ \ | |/ / /
| * | | Merge changes I16ad392e,Ie26a7d01 into lmp-preview-devRoboErik2014-05-3013-938/+719
| |\ \ \
| | * | | Refactor transport controls APIsRoboErik2014-05-307-826/+577
| | * | | API changes to sessionsRoboErik2014-05-2913-196/+226
| | |/ /
* | | | am 511b84d2: Merge "camera2: Change android.lens.focusRange to Pair<Float,Flo...Igor Murashkin2014-05-301-0/+17
|\ \ \ \ | |/ / /
| * | | camera2: Change android.lens.focusRange to Pair<Float,Float>Igor Murashkin2014-05-301-0/+17
* | | | Merge "indicate in and out audio device connection separately"Eric Laurent2014-05-301-14/+19
|\ \ \ \
| * | | | indicate in and out audio device connection separatelyEric Laurent2014-05-291-14/+19
* | | | | am 6118de49: Merge "Camera2: Test null TonemapCurve behavior" into lmp-previe...Yin-Chia Yeh2014-05-291-4/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Camera2: Test null TonemapCurve behavior" into lmp-preview-devYin-Chia Yeh2014-05-291-4/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Camera2: Test null TonemapCurve behaviorYin-Chia Yeh2014-05-281-4/+7
| | | |/ | | |/|
| * | | Merge "DO NOT MERGE - AudioManager: audio routing extensions" into lmp-previe...Eric Laurent2014-05-2811-0/+980
| |\ \ \ | | |/ / | |/| |
| | * | DO NOT MERGE - AudioManager: audio routing extensionsEric Laurent2014-05-2811-0/+980
* | | | Merge "Add Audio Manager support for Bluetooth A2DP Sink profile"Mike Lockwood2014-05-284-18/+108
|\ \ \ \
| * | | | Add Audio Manager support for Bluetooth A2DP Sink profileMike Lockwood2014-05-284-18/+108
| | |_|/ | |/| |
* | | | am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 ...Eino-Ville Talvala2014-05-281-0/+64
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-prev...Eino-Ville Talvala2014-05-281-0/+64
| |\ \ | | |/ | |/|
| | * Camera2: switch API interface to java classsesYin-Chia Yeh2014-05-281-0/+22
| | * camera2: Add new metadata keys, change types for existing range keysIgor Murashkin2014-05-281-0/+42
| * | DO NOT MERGE temporary hide of AudioAttributesJean-Michel Trivi2014-05-271-0/+1
| |/
* | Merge "AudioManager: audio routing extensions"Eric Laurent2014-05-2711-0/+980
|\ \
| * | AudioManager: audio routing extensionsEric Laurent2014-05-2711-0/+980
* | | am c5890bb9: Merge "VolumeZen: combine ringer/notification volume and zen." i...John Spurlock2014-05-271-3/+10
|\ \ \ | |/ / |/| / | |/
| * VolumeZen: combine ringer/notification volume and zen.John Spurlock2014-05-271-3/+10
* | am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-p...Ruben Brunk2014-05-244-1149/+0
|\ \ | |/
| * Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-devRuben Brunk2014-05-244-1149/+0
| |\
| | * camera2: Move DngCreator to hardware/camera2.Ruben Brunk2014-05-224-1149/+0
* | | Merge "Remove android.media.AudioFormat default constructor"Glenn Kasten2014-05-231-0/+6
|\ \ \
| * | | Remove android.media.AudioFormat default constructorGlenn Kasten2014-05-221-0/+6
| | |/ | |/|
* | | am 5231cb4b: am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadloc...Eric Laurent2014-05-231-133/+147
|\ \ \ | |_|/ |/| |
| * | am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeSt...Eric Laurent2014-05-231-133/+147
| |\ \
| | * \ am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"Eric Laurent2014-05-231-133/+147
| | |\ \