Elliott Hughes 2432912b35 resolved conflicts for merge of f8272896 to master ...

Change-Id: I34a156bceb5dacd90c399c56c6f07d2a8e5c0c85

2014-06-05 11:35:53 -07:00

..

audioeffect

AArch64: Use long for pointers in audio effect classes

2014-01-07 12:47:51 +00:00

soundpool

Add stream-level suppression to vibrate/audio services.

2014-03-19 15:32:51 -04:00

android_media_AmrInputStream.cpp

AArch64: Use long for pointers in AmrInputStream

2014-01-07 12:44:38 +00:00

android_media_ImageReader.cpp

camera2: Add HAL1 compatibility shim skeleton.

2014-05-21 16:37:59 -07:00

android_media_MediaCodec.cpp

Added MediaCodec.releaseOutputBuffer() method with render timestamp

2014-05-09 20:43:30 +00:00

android_media_MediaCodec.h

Added MediaCodec.releaseOutputBuffer() method with render timestamp

2014-05-09 20:43:30 +00:00

android_media_MediaCodecList.cpp

MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities

2013-08-13 10:30:22 -07:00

android_media_MediaCrypto.cpp

AArch64: Use long for pointers in media classes

2014-01-15 13:09:27 +00:00

android_media_MediaCrypto.h

Unhide new media related java APIs.

2012-04-16 10:14:05 -07:00

android_media_MediaDrm.cpp

Allow DRM plugins to be destroyed when released

2014-04-11 16:11:15 -07:00

android_media_MediaDrm.h

Allow DRM plugins to be destroyed when released

2014-04-11 16:11:15 -07:00

android_media_MediaExtractor.cpp

am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"

2014-03-31 09:53:35 +00:00

android_media_MediaExtractor.h

FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code

2014-02-04 14:45:28 -08:00

android_media_MediaHTTPConnection.cpp

MediaHTTPConnection: fix JNI signature

2014-03-20 11:23:29 -07:00

android_media_MediaHTTPConnection.h

FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code

2014-02-04 14:45:28 -08:00

android_media_MediaMetadataRetriever.cpp

am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

2014-05-01 15:35:31 +00:00

android_media_MediaMuxer.cpp

am a034dac7: android_media_MediaMuxer_setLocation: amended signature.

2014-05-30 18:05:35 +00:00

android_media_MediaPlayer.cpp

camera2: Move DngCreator to hardware/camera2.

2014-05-22 22:57:11 +00:00

android_media_MediaProfiles.cpp

Remove VideoEditor

2014-04-21 16:11:51 -07:00

android_media_MediaRecorder.cpp

am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"

2014-04-16 19:58:26 +00:00

android_media_MediaScanner.cpp

[LP64] Fix access to MediaAlbumArt.

2014-06-05 10:38:30 -07:00

android_media_ResampleInputStream.cpp

…

android_media_Utils.cpp

Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef

2013-08-12 09:23:49 -07:00

android_media_Utils.h

Implementation of a java media codec interface and associated tools.

2012-02-22 15:06:06 -08:00

android_mtp_MtpDatabase.cpp

am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."

2014-06-02 18:32:26 +00:00

android_mtp_MtpDevice.cpp

AArch64: Use long for pointers in MTP classes

2014-01-07 12:52:57 +00:00

android_mtp_MtpServer.cpp

MTP: Add support for battery level device property

2014-03-12 08:46:47 -07:00

Android.mk

camera2: Move DngCreator to hardware/camera2.

2014-05-22 22:57:11 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…