summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Add multi user volume management" into jb-mr1-devEric Laurent2012-09-201-28/+64
|\ \ | |/ |/|
| * Add multi user volume managementEric Laurent2012-09-191-28/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification and Alarm volumes are per user: they are saved and restored when the foreground user changes. Media volume is global: it is still saved and restored per user for implentation reasons but is copied from one user to the next to ensure media playback volume continuity when switching users. Ringer mode (silent, vibrate...) is now a global setting. Bug 7128886. Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6
* | Merge "New API for querying audio properties" into jb-mr1-devGlenn Kasten2012-09-191-0/+29
|\ \
| * | New API for querying audio propertiesGlenn Kasten2012-09-171-0/+29
| | | | | | | | | | | | | | | Bug: 6635041 Change-Id: I66e87c75af7c84cdb23cb25a958e79bba8e53baa
* | | Merge "AudioService: Send "becoming noisy" intent when USB accessory audio ↵Mike Lockwood2012-09-181-3/+6
|\ \ \ | | | | | | | | | | | | is disconnected" into jb-mr1-dev
| * | | AudioService: Send "becoming noisy" intent when USB accessory audio is ↵Mike Lockwood2012-09-181-3/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | disconnected Bug: 7051259 Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t ↵Mike Lockwood2012-09-181-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | recognize when copy bmp into DUT" * commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6': MtpData bmp format file can't recognize when copy bmp into DUT
| * | am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp ↵Mike Lockwood2012-09-181-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into DUT" * commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490': MtpData bmp format file can't recognize when copy bmp into DUT
| | * \ Merge "MtpData bmp format file can't recognize when copy bmp into DUT"Mike Lockwood2012-09-181-0/+1
| | |\ \
| | | * | MtpData bmp format file can't recognize when copy bmp into DUTbo huang2012-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for bmp format. Change-Id: I67d4703b43cd32abad638bae57bbceb65b4be6de Author: bo huang <bo.b.huang@intel.com> Signed-off-by: bo huang <bo.b.huang@intel.com> Signed-off-by: Wu, Hao <hao.wu@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: 24555
* | | | | headphone volume limitationEric Laurent2012-09-161-1/+164
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit music volume when headphones or headset are inserted. Display warning message when user wants to increase the volume above a platform specific volume and request user acknowledgement before proceeding. TODO: exact wording of the warning message must be defined by UX. Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
* | | | MtpDatabase: Use actual file size instead of media database size columnMike Lockwood2012-09-121-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problems with file transfer from device to host that can occur if the database size value is wrong. Bug: 6954446 Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | Merge "MtpDatabase: Fix typo affecting parent and format queries" into ↵Mike Lockwood2012-09-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | MtpDatabase: Fix typo affecting parent and format queriesMike Lockwood2012-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7114350 Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | Add support for controlling remote submix audio routingJean-Michel Trivi2012-09-105-3/+65
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method in AudioManager to control remote submix through AudioService. AudioService controls remote submxi: enabling/disabling remote submix will: - make the sink audio device available/unavailable - make the audio source available/unavailable - force/unforce media streams to be routed to WFD Change-Id: I05d9cc7c3e8a720318ec1385737cbd46a21a3207
* | | | Merge "Add support for Wifi display." into jb-mr1-devJeff Brown2012-09-071-0/+153
|\ \ \ \
| * | | | Add support for Wifi display.Jeff Brown2012-09-071-0/+153
| | | | | | | | | | | | | | | | | | | | Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
* | | | | AudioSystem: new audio device enumsEric Laurent2012-09-071-11/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Update audio device enums to match new definitions in native framework. Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
* | | | am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can ↵Jean-Baptiste Queru2012-09-061-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | not display DRM files of internal storage." * commit '657dba9e66ff02785c2bf034ebecc3c357cbc333': Musicplayer application can not display DRM files of internal storage.
| * | | 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
* | | | 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.
generated by cgit v1.1 at 2024-10-31 18:08:47 +0000