Jeff Tinker c8c0de38d1 Merge "Support AES-CBC sample encryption in MediaDrm"

2016-01-12 17:42:16 +00:00

..

audioeffect

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

soundpool

Use FCC_2 and FCC_8 to highlight channel count assumptions

2016-01-05 11:44:12 -08:00

android_media_AmrInputStream.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_ImageReader.cpp

Camera: add RAW_PRIVATE format

2015-12-09 11:20:32 -08:00

android_media_ImageWriter.cpp

media: improve ImageReader/Writer native memory management

2015-12-07 14:38:37 -08:00

android_media_MediaCodec.cpp

Support AES-CBC sample encryption in MediaDrm

2016-01-11 17:11:51 -08:00

android_media_MediaCodec.h

Support AES-CBC sample encryption in MediaDrm

2016-01-11 17:11:51 -08:00

android_media_MediaCodecList.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaCrypto.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaCrypto.h

…

android_media_MediaDataSource.cpp

…

android_media_MediaDataSource.h

…

android_media_MediaDrm.cpp

Remove unused MediaDrm.unprovisionDevice

2015-12-09 09:02:31 -08:00

android_media_MediaDrm.h

…

android_media_MediaExtractor.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaExtractor.h

…

android_media_MediaHTTPConnection.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaHTTPConnection.h

…

android_media_MediaMetadataRetriever.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaMuxer.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_MediaPlayer.cpp

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

android_media_MediaProfiles.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_MediaRecorder.cpp

Implement pause/resume functionality to MediaRecorder

2015-10-08 08:40:34 +00:00

android_media_MediaScanner.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_MediaSync.cpp

…

android_media_MediaSync.h

…

android_media_PlaybackParams.h

…

android_media_ResampleInputStream.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_media_SyncParams.cpp

…

android_media_SyncParams.h

…

android_media_Utils.cpp

…

android_media_Utils.h

…

android_mtp_MtpDatabase.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

android_mtp_MtpDevice.cpp

Reland "Add event parameters to MtpEvent."

2016-01-12 12:14:30 +09:00

android_mtp_MtpServer.cpp

constify JNINativeMethod function pointer tables

2015-09-22 17:10:35 -04:00

Android.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…