summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am bb60bc26: Merge "Musicplayer application can not display DRM files of ↵Jean-Baptiste Queru2012-09-061-1/+2
|\ | | | | | | | | | | | | internal storage." * commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c': Musicplayer application can not display DRM files of internal storage.
| * Musicplayer application can not display DRM files of internal storage.Jan Bjernler2012-08-311-1/+2
| | | | | | | | | | | | | | | | | | Make DRM-protected files transferred over MTP be detected. Previously it was inserted into the database as MEDIA_TYPE_NONE, the result of this was that the file was not detected properly. With this fix the file is scanned from the beginning. Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
* | am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"Jean-Baptiste Queru2012-08-271-3/+2
|\ \ | |/ | | | | | | * commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a': Make setCaptureRate locale safe
| * Make setCaptureRate locale safeJohan Redestig2012-08-271-3/+2
| | | | | | | | | | | | | | | | Dont use the default String.format in setCaptureRate as it is both locale unsafe and less efficient than regular string concatenation in this case. Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
* | am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
|\ \ | |/ | | | | | | * commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450': To avoid the JNI memory leaks in video editor codes
| * To avoid the JNI memory leaks in video editor codeswfeng62012-08-173-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a protential memory leak in video editor JNI codes. When importing so many video clips, the number of local reference will exceed 512, which will cause the Dalvik virtual machine crash. The patch will free each local reference when it's no longer used to avoid memory leaks. Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40 Author: Wei Feng <wei.feng@intel.com> Signed-off-by: Wei Feng <wei.feng@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 40786
* | am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"Jean-Baptiste Queru2012-08-161-2/+2
|\ \ | |/ | | | | | | * commit 'd2fb6e99bda1ae607b5dfbb68905030f2133f8e8': Fix Issue #35489: drm content corruption on GB
| * Fix Issue #35489: drm content corruption on GBgit-you.kim72.gmail.com2012-08-131-2/+2
| | | | | | | | | | | | | | | | If rawContent is copied into mediaBuf, readBuf is copied to wrong address. mediaBuf should be forwarded by readBytes. Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248 Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
* | am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that ↵Jean-Baptiste Queru2012-08-131-1/+4
|\ \ | |/ | | | | | | | | | | does not exist" * commit '4da3769d30851f0b517a688a5c835715d7d0b0bf': mediacodec: Don't crash if trying to open a codec that does not exist
| * mediacodec: Don't crash if trying to open a codec that does not existMartin Storsjo2012-08-131-1/+4
| | | | | | | | Change-Id: If75e3156517993629f50622a84a9ac573fced815
* | am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"Jean-Baptiste Queru2012-08-101-2/+2
|\ \ | |/ | | | | | | * commit '53ad027c46bf578e26e5db70319b17a671ce8a36': MtpStorage: correct the size of reserve space for MTP
| * Merge "MtpStorage: correct the size of reserve space for MTP"Jean-Baptiste Queru2012-08-101-2/+2
| |\
| | * MtpStorage: correct the size of reserve space for MTPbo huang2012-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to description in frameworks/base/core/res/res/xml/storage_list.xml, "mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage". Mtpstorage class use it directly and doesn't change it to correct size in megabyes. Mtp initor can not get correct storage information from android. Change-Id: Icf59eb1eb478e67ea5990be96a9decb41aa55504 Signed-off-by: Bo Huang <bo.b.huang@intel.com> Signed-off-by: Jack Ren<jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() ↵Jean-Baptiste Queru2012-08-081-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | immediately" * commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3': mediacodec: Don't suggest calling getOutputFormat() immediately
| * | mediacodec: Don't suggest calling getOutputFormat() immediatelyMartin Storsjo2012-07-131-2/+1
| |/ | | | | | | | | | | | | | | Calling getOutputFormat() at this point currently crashes in native code. (After a fix to the native code, this gives an IllegalStateException instead.) Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
* | am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214Jeff Smith2012-07-252-2/+2
|\ \ | | | | | | | | | | | | * commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4': Fix several cases of broken droiddoc syntax external issue 35214
| * | Fix several cases of broken droiddoc syntaxJeff Smith2012-07-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | external issue 35214 patch contributed by Jeff Smith <whydoubt@yahoo.com> Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83
* | | am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in ↵James Dong2012-07-182-8/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | jni." into jb-dev * commit '5d478b9c1009b077649f7f870d993832d380d63c': Changed to obtain a parcel in each notify() call in jni.
| * | Merge "Changed to obtain a parcel in each notify() call in jni." into jb-devJames Dong2012-07-182-8/+5
| |\ \
| | * | Changed to obtain a parcel in each notify() call in jni.Insun Kang2012-07-102-8/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85 related-to-bug: 6785452
* | | | am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." ↵Adam Powell2012-07-161-7/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '388953942b536b5eebd942ef78ae5b7499bc2078': Properly switch MediaRouter to wired audio over a2dp.
| * | | Properly switch MediaRouter to wired audio over a2dp.Adam Powell2012-07-121-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The system gives priority to physically connected headphones/speakers/docks/etc. Reflect this in MediaRouter and associated UI. Bug 6777592 Change-Id: Ibabf3d7512207117e892c99f004443490c3d0612
* | | | am 10366b93: Merge "Remove the unnecssary intent call." into jb-devYu Shan Emily Lau2012-07-101-11/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '10366b93157718ed8621f5af087e7a771191b41a': Remove the unnecssary intent call.
| * | Merge "Remove the unnecssary intent call." into jb-devYu Shan Emily Lau2012-07-101-11/+5
| |\ \ | | |/ | |/|
| | * Remove the unnecssary intent call.Yu Shan Emily Lau2012-07-101-11/+5
| | | | | | | | | | | | Change-Id: Ia0a460ca8532ccb2f4b0f0205d192b1ba907b5b6
* | | am 099fd80f: docs: add throws notice for isPlaying per external issue 33610Scott Main2012-07-031-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '099fd80f984b8493de58bdda8ea05563261b0af2': docs: add throws notice for isPlaying per external issue 33610
| * | docs: add throws notice for isPlayingScott Main2012-07-031-0/+2
| | | | | | | | | | | | | | | | | | per external issue 33610 Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
* | | am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect ↵Scott Main2012-06-282-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | late API changes." into jb-dev * commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae': Minor corrections to the javadoc overview to reflect late API changes.
| * | Merge "Minor corrections to the javadoc overview to reflect late API ↵Scott Main2012-06-282-3/+3
| |\ \ | | | | | | | | | | | | changes." into jb-dev
| | * | Minor corrections to the javadoc overview to reflect late API changes.Andreas Huber2012-06-272-3/+3
| | |/ | | | | | | | | | Change-Id: If64e7ea0fa9c892d728282e5e18547a4da115989
* | | am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP ↵Mike Lockwood2012-06-261-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | directory deletes" into jb-dev * commit '7017d51e147a0f6ed2370fb79c656c9726304131': MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
| * | Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" ↵Mike Lockwood2012-06-261-4/+4
| |\ \ | | |/ | |/| | | | into jb-dev
| | * MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletesMike Lockwood2012-06-261-4/+4
| | | | | | | | | | | | | | | | | | | | | Bug: 6684451 Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | am c8c5e98b: Merge "Document some of the more common mimetypes to be used ↵Andreas Huber2012-06-251-0/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | when instantiating" into jb-dev * commit 'c8c5e98b9ea0be4d161382fc537955d505e65a6c': Document some of the more common mimetypes to be used when instantiating
| * | Document some of the more common mimetypes to be used when instantiatingAndreas Huber2012-06-251-0/+16
| |/ | | | | | | | | | | MediaCodec components. Change-Id: I810507d1d76a28666eb6fb63e3b597d38e5f1389
* | am dbbfa702: Fix MediaRouter bugsAdam Powell2012-06-241-1/+2
|\ \ | |/ | | | | | | * commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89': Fix MediaRouter bugs
| * Fix MediaRouter bugsAdam Powell2012-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | Fix a bug where a newly added group had no supported types at the time of callback dispatch, meaning that no registered callbacks would be invoked. Fix a bug where subscribed type flags were not updated properly when re-adding a callback for new types. Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
* | am fd3fd482: Merge "Update route count properly when MediaRouteButton ↵Adam Powell2012-06-231-2/+2
|\ \ | |/ | | | | | | | | | | detects grouped/ungrouped events" into jb-dev * commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49': Update route count properly when MediaRouteButton detects grouped/ungrouped events
| * Update route count properly when MediaRouteButton detectsAdam Powell2012-06-221-2/+2
| | | | | | | | | | | | grouped/ungrouped events Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
* | am d7c00d2b: Merge "MediaRouter group volume reporting" into jb-devAdam Powell2012-06-211-1/+32
|\ \ | |/ | | | | | | * commit 'd7c00d2bdd011d3a73faf1c4a5bb8012d24dd648': MediaRouter group volume reporting
| * MediaRouter group volume reportingAdam Powell2012-06-201-1/+32
| | | | | | | | | | | | | | | | | | RouteGroups always report back the loudest volume of their component routes. Maintain this through volume update requests (such as those reported by volume hard keys) such that each route updates individually, but the group slider always indicates the loudest value. Change-Id: I5de4b9048bf55682b6271e9485fe50496a1c97c2
* | am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-4/+192
|\ \ | |/ | | | | | | * commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf': Expand volume APIs for MediaRouter
| * Merge "Expand volume APIs for MediaRouter" into jb-devAdam Powell2012-06-201-4/+192
| |\
| | * Expand volume APIs for MediaRouterAdam Powell2012-06-201-4/+192
| | | | | | | | | | | | | | | | | | | | | | | | Allow applications to set a requested volume level on RouteInfo objects. If requested for a user route, the app-supplied callback will be invoked to perform actual volume adjustment. Change-Id: I856990a0da7292492aa15e6562dbc3d055b848a0
* | | am 60c5b714: Merge "Crash in SurfaceTextureTarget filter open" into jb-devPannag Sanketi2012-06-201-3/+12
|\ \ \ | |/ / | | | | | | | | | * commit '60c5b714dc747eef0b5c2a57db60b162315fba2f': Crash in SurfaceTextureTarget filter open
| * | Merge "Crash in SurfaceTextureTarget filter open" into jb-devPannag Sanketi2012-06-201-3/+12
| |\ \ | | |/ | |/|
| | * Crash in SurfaceTextureTarget filter openPannag Sanketi2012-06-201-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the filter graph in an app closes out, the SurfaceTextureTarget filter was losing the reference to the original surfacetexture, and the app would re-start the graph without setting the surfacetexture again, thus leading to a crash in registering a surface from surfacetexture. Typical scenarios is start/stop immediately in camera effects recording. Fix part of b/6651352 Fix part of b/6655597 Change-Id: Ib2bae7e886784e91b3a886f7ccd439ff190feb22
* | | am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote ↵Jean-Michel Trivi2012-06-201-16/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | playback" into jb-dev * commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994': Unhide new API in android.media.MediaRouter for remote playback
| * | Unhide new API in android.media.MediaRouter for remote playbackJean-Michel Trivi2012-06-201-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Expose new functionality for handling remote volume in: android.media.MediaRouter.RouteInfo android.media.MediaRouter.UserRouteInfo android.media.MediaRouter.VolumeCallback Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
* | | am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-devJean-Michel Trivi2012-06-202-8/+30
|\ \ \ | |/ / | | | | | | | | | * commit 'fc178e381d3db299901a96461122eb22a4ffb43e': Asynchronous handling of remote volume updates
generated by cgit v1.1 at 2025-04-03 07:29:02 +0000