summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Improve multi-user broadcasts." into jb-mr1-devDianne Hackborn2012-08-301-18/+49
|\ \ \ \
| * | | | Improve multi-user broadcasts.Dianne Hackborn2012-08-301-18/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now use ALL and CURRENT when sending broadcasts, to specify where the broadcast goes. Sticky broadcasts are now correctly separated per user, and registered receivers are filtered based on the requested target user. New Context APIs for more kinds of sending broadcasts as users. Updating a bunch of system code that sends broadcasts to explicitly specify which user the broadcast goes to. Made a single version of the code for interpreting the requested target user ID that all entries to activity manager (start activity, send broadcast, start service) use. Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
* | | | | Merge "Fix a typo in the sample code" into jb-mr1-devTeng-Hui Zhu2012-08-301-1/+1
|\ \ \ \ \
| * | | | | Fix a typo in the sample codeTeng-Hui Zhu2012-08-301-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
* | | | | AudioService: pause music when undockedEric Laurent2012-08-301-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send becomming noisy event also when disconnecting a dock (analog, digital or USB) or HDMI. Bug 6760590. Change-Id: I497df35a3c6817d2b300f532d4cc3f12e3ce9ace
* | | | am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"Jean-Baptiste Queru2012-08-271-3/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a': Make setCaptureRate locale safe
| * | | 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
* | | Added some common error codes in MediaPlayer.javaJames Dong2012-08-261-0/+16
| | | | | | | | | | | | | | | | | | o related-to-bug: 6770717 Change-Id: Iea8ba6943755a9af8df5b6e91284c7c1b32c3c6c
* | | Let apps provide a custom data source for extractorsMarco Nelissen2012-08-242-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Adds android.media.DataSource, which is modeled after its native namesake, and a new method on MediaExtractor that lets apps specify their implementation of a DataSource as the source of data for the extractor. Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
* | | am d2388b50: am 53ad027c: Merge "MtpStorage: correct the size of reserve ↵Jean-Baptiste Queru2012-08-101-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | space for MTP" * commit 'd2388b50a5c16b920bdd656448107a21e49d753b': MtpStorage: correct the size of reserve space for MTP
| * | 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
* | | Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java ↵James Dong2012-08-081-1/+7
|\ \ \ | | | | | | | | | | | | class" into jb-mr1-dev
| * | | Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java classJames Dong2012-08-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | o As a result, applications can listen for death notification from MediaRecorder onError callbacks Change-Id: I49896c4ae8130bd67b52deff6eb97a22b43d3f32
* | | | MediaFile: Fix case sensitive file extension matching for computing MTP ↵Mike Lockwood2012-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format code Bug: 6939136 Change-Id: Iefd4083aefbd4b175a2f8c860a9e13c99ded9c82 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | mediacodec: Don't suggest calling getOutputFormat() immediatelyMartin Storsjo2012-08-071-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
* | | Improve scan time for some casesMarco Nelissen2012-08-021-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path being matched has a sqlite wildcard character in it, a "like" match will be quite slow. Unfortunately this is fairly common, since "_" is a wildcard character. However, because in most cases the case of the path in the database will match the case on disk, an "=" match will work, so it is worthwhile to try an "=" match first, before trying a "like". If there are no wildcard characters, the "like" will be as fast as the "=", because of the case-insensitive index on the _data column, so there is no need to try "=" first in that case. b/6751354 Change-Id: I1cd4efbd56a37886cb44a86acb73eb9a3c9f303d
* | | Added a key to retrieve the rotation angle in MediaMetadataRetriever.java classJames Dong2012-07-311-0/+5
| | | | | | | | | | | | | | | | | | o related-to-bug: 6872687 Change-Id: I94569bb8357c39e8309974ede8284b33a996866c
* | | Fix a typo (dependant => dependent)James Dong2012-07-301-2/+2
| | | | | | | | | | | | Change-Id: I0337bec1a26e852c32ea9f1ce54f270f79ee3ab1
* | | Relax rules for media apps to stay on RemoteControlDisplayJean-Michel Trivi2012-07-271-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The playback of notification would make the display of the RemoteControlClient disappear from the lockscreen. Fixed by modifying which AudioFocus owner to consider when reevaluating how the RemoteControlDisplay needs to be updated: use the first (starting from the top of the AudioFocus stack) that uses STREAM_MUSIC, or that uses any other stream type for a short period. Change-Id: Id7cef00c5eed1f6ebfa59634eea8e2c9b2f3f5eb
* | | am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax ↵Jeff Smith2012-07-252-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | external issue 35214 * commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c': Fix several cases of broken droiddoc syntax external issue 35214
| * | 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
* | | | Added MEDIA_INFO_VIDEO_RENDERING_START as an informational eventJames Dong2012-07-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o MEDIA_INFO_VIDEO_RENDERING_START indicates that the player just pushed the very first video frame of a video source for rendering. Change-Id: I32dad93990f5d48b70fc79d841ca3ce3b1af4027 related-to-bug: 6851811
* | | | am d1a0a53e: am 5d478b9c: Merge "Changed to obtain a parcel in each notify() ↵James Dong2012-07-181-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | call in jni." into jb-dev * commit 'd1a0a53eec141b615697652b3a8907a60298a414': Changed to obtain a parcel in each notify() call in jni.
| * | | am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in ↵James Dong2012-07-181-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 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-181-0/+1
| | |\ \
| | | * | Changed to obtain a parcel in each notify() call in jni.Insun Kang2012-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85 related-to-bug: 6785452
* | | | | am c36b8acd: am 38895394: Merge "Properly switch MediaRouter to wired audio ↵Adam Powell2012-07-161-7/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | over a2dp." into jb-dev * commit 'c36b8acd1e850619de0bbf678b9573d4d761d836': Properly switch MediaRouter to wired audio over a2dp.
| * | | | 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
* | | Fix sound effect attenuation calculationJean-Michel Trivi2012-07-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The sound effect volume attenuation calculation is wrong: the division by 20 was always returning 1 or 0. In AudioService, rename the sound effect attenuation value to follow the naming conventions for static variables. Change-Id: I3c36d50f4470ff09ca98cb944aefb5ad0f968782
* | | Merge "AudioService: fix a2dp force use delay"Eric Laurent2012-07-101-7/+14
|\ \ \
| * | | AudioService: fix a2dp force use delayEric Laurent2012-07-091-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed setBluetoothA2dpOnInt() so that AudioSystem.setForceUse() is called synchronously and not via a message. This is because the order in which setForceUse() and setDeviceConnectionState() are executed is important to avoid audio glitches when called from onSetWiredDeviceConnectionState(). Bug 6720482. Change-Id: I09c975d1108fd38f31b047c082acdf944ab790a7
* | | | am 7b5488d8: am 099fd80f: docs: add throws notice for isPlaying per external ↵Scott Main2012-07-031-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | issue 33610 * commit '7b5488d85d8ed36c42a821fb0064de741cca35c9': docs: add throws notice for isPlaying per external issue 33610
| * | 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 00a82605: am f443c5ea: Merge "Minor corrections to the javadoc overview ↵Scott Main2012-06-282-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | to reflect late API changes." into jb-dev * commit '00a82605a17360f5b9005035a75d779a231d5a5c': Minor corrections to the javadoc overview to reflect late API changes.
| * | 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 1524e625: am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching ↵Mike Lockwood2012-06-261-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for MTP directory deletes" into jb-dev * commit '1524e625067da52e1365e4f939d4683edeea2fd5': MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
| * | | 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 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes ↵Andreas Huber2012-06-251-0/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to be used when instantiating" into jb-dev * commit '6dfd6aec2730bfdde6da646dafa8597a34a17b4e': Document some of the more common mimetypes to be used when instantiating