summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Missing Javadoc update while API reviewSungsoo Lim2014-12-161-2/+2
| | | | | | Bug: 18550989 Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf (cherry picked from commit 4e389e557efb7806b73d2059d46e2809c1a9f83d)
* am 8db769dd: am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am ↵Eric Laurent2014-11-101-18/+2
|\ | | | | | | | | | | | | 1c2b0d52: AudioEffect JNI: use new max preprocessing constant * commit '8db769dd56822a59f1997a9cb53ed02d3d1cb8dd': AudioEffect JNI: use new max preprocessing constant
| * am df878bd3: am ced2f74a: am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect ↵Eric Laurent2014-11-101-18/+2
| |\ | | | | | | | | | | | | | | | | | | JNI: use new max preprocessing constant * commit 'df878bd3fc63f26e91b055e39ba63c53c14b31a0': AudioEffect JNI: use new max preprocessing constant
| | * am e8c1a97f: am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max ↵Eric Laurent2014-11-101-18/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | preprocessing constant * commit 'e8c1a97fa33797df528265b6f0b0c2c39ac2c589': AudioEffect JNI: use new max preprocessing constant
| | | * am 3b92fc04: am 1c2b0d52: AudioEffect JNI: use new max preprocessing constantEric Laurent2014-11-101-18/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '3b92fc04700a68dab3c3c4a873535837c4e51e8b': AudioEffect JNI: use new max preprocessing constant
| | | | * am 1c2b0d52: AudioEffect JNI: use new max preprocessing constantEric Laurent2014-11-101-18/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202': AudioEffect JNI: use new max preprocessing constant
| | | | | * AudioEffect JNI: use new max preprocessing constantEric Laurent2014-11-101-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18226810. Change-Id: Ica5677da247268306b34dfce38f25394586817fd (cherry picked from commit b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
| | | * | | am e825f0ee: am 60f22fbf: Do not restore the media button event receiverJean-Michel Trivi2014-09-101-27/+0
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit 'e825f0eec571831ceb60e65ec7e2a6b1ed7be5bd': Do not restore the media button event receiver
| | | | * | am 60f22fbf: Do not restore the media button event receiverJean-Michel Trivi2014-09-101-27/+0
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | * commit '60f22fbf67a69e8f3604afb46ccd7c3bd2819cb1': Do not restore the media button event receiver
| | | | | * Do not restore the media button event receiverJean-Michel Trivi2014-09-101-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not restore the media button event receiver on behalf of the application that registered. Prevents reported vulnerability. Bug 15428797 Change-Id: If40ee6bc0c77c191643129daa92eb26755e70cb0
| | | * | | am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-devMarco Nelissen2014-03-202-0/+45
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7': Verify certificates
| | | | * | am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-devMarco Nelissen2014-03-202-0/+45
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | * commit '759445c5bdb2eb54af9e974f604226596976e078': Verify certificates
| | | | | * resolved conflicts for merge of c53ad4cd to jb-mr2-devMarco Nelissen2014-03-202-0/+45
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
| | | | | | * am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved ↵Marco Nelissen2014-03-202-0/+45
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for merge of 534f3e94 to jb-mr1-dev * commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c': Verify certificates
| | | | | | | * am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-devMarco Nelissen2014-03-202-0/+45
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81fbdade8db4117157ea48602be121e6cf5597dd': Verify certificates
| | | | | | | | * resolved conflicts for merge of 534f3e94 to jb-mr1-devMarco Nelissen2014-03-202-0/+45
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
| | | | | | | | | * am a3337bc7: Merge "Verify certificates" into jb-devMarco Nelissen2014-03-202-0/+45
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd': Verify certificates
| | | | | | | | | | * Verify certificatesMarco Nelissen2014-03-172-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Cherrypicked from 7e435a011dd519f76a8ec1a8ed99a22bee5c3e26 https://googleplex-android-review.git.corp.google.com/#/c/433316/ Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
| | | | | | * | | | | am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am ↵Nick Kralevich2013-04-292-7/+43
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls * commit '0412d9c7c7e5977e1ffbb3a28bba9f37807876a7': libdrm: fix bad strncpy / snprintf calls
| | | | | | | * | | | am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd440ca76029ab6f0909fdd9495941e04b90e5da7': libdrm: fix bad strncpy / snprintf calls
| | | | | | | | * | | am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52': libdrm: fix bad strncpy / snprintf calls
| | | | | | | | | * | am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | | | | | | | |\ \ | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d8f5b755b133b308204b84145d773d401cdcd52': libdrm: fix bad strncpy / snprintf calls
| | | | | | | | | | * libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following bugs reported by IOActive: * GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow * GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow * GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow * GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow * GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow Bug: 8727221 (cherry picked from commit 25619b2c6b3fd584affe20f34bfbf164a5ddbe7d) Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2
| * | | | | | | | | | DO NOT MERGE Hide the volume panel for watches for nowJustin Koh2014-10-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide the volume panel: it's not usable. Need new design in a future release. Bug: 17753651 Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
| * | | | | | | | | | am 6d4873f5: am 0511ba50: Do not persist and restore the media button event ↵Jean-Michel Trivi2014-09-032-59/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiver * commit '6d4873f577774e5e7427e2675e4c6ff8049646be': Do not persist and restore the media button event receiver
| | * | | | | | | | | Do not persist and restore the media button event receiverJean-Michel Trivi2014-08-252-59/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not persist the media button event receiver. Do not restore the media button event receiver on behalf of the application that registered. Prevents reported vulnerability. Bug 15428797 Change-Id: I7ca3e7fccb165c55b23f471c00e0ed77436f7dc1
* | | | | | | | | | | docs: Removed broken link to non-existent method.Andrew Solovay2014-11-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc had included link to method MediaBrowserService.onLoadIcon(). Per bug http://b/17205016 that method was removed before release. Revised doc is staged to: http://asolovay.mtv.corp.google.com:9650/reference/android/service/media/MediaBrowserService.Result.html (Note that the other "See Also" link, which I didn't remove, is badly formatted because Javadoc seems to choke on links to methods that are passed generic types. JoeFernandez@, if you can suggest a better way to format that link I'll make that change too.) bug: 18229650 Change-Id: Ic55ae8b9edc6dd314cf5acc306abd8a9d5f71134
* | | | | | | | | | | Add missing break to switch statementRoboErik2014-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the skip to queue item case was falling through when it shouldn't. bug: 18058515 Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
* | | | | | | | | | | Set the metadata rating correctly in RCCRoboErik2014-10-201-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We weren't setting the ratings in the new MediaMetadata from RCC. This adds some code to set them correctly. bug:18051829 Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
* | | | | | | | | | | Merge "Also consider secondary storage when verifying paths" into lmp-devMarco Nelissen2014-10-161-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also consider secondary storage when verifying pathsMarco Nelissen2014-10-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17673184 Bug: 17982103 Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
* | | | | | | | | | | | Leave zen when apps set ringer-mode = non-silent (normal/vibrate).John Spurlock2014-10-153-5/+31
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps can end up in priority mode by setting ringer-mode = silent. Now they can leave priority mode by setting ringer-mode = non-silent. (normal or vibrate) Bug: 17884168 Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
* | | | | | | | | | | MediaHTTPConnection: do not use proxy for localhostChong Zhang2014-10-091-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17681512 Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
* | | | | | | | | | | AudioService: Fix monitorRotation for landscape applicationsJon Eklund2014-10-081-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implmentation only sends rotation updates on orientation changes, so does not handle direct 0<->180 or 90<->270 transitions. Update rotation based on an OrientationEventListener instead of Intent.ACTION_CONFIGURATION_CHANGED Bug 17606902 Change-Id: I01dfcd1c587f5b2e8a96365c2389782ad77936ef
* | | | | | | | | | | Full volume on remote submix for apps that need itJean-Michel Trivi2014-10-073-6/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an AudioRecord is created with the "fixedVolume" tag when recording from REMOTE_SUBMIX, treat the device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume device during the recording. Also register a death handler during the recording. Otherwise this is a no-op. Bug 17635294 Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
* | | | | | | | | | | Fix regression in RCC.editMetadata(false)RoboErik2014-10-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found a very simple fix. Just set the cached metadata so we have it to copy over when editMetadata(false) is called. bug:17796693 Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
* | | | | | | | | | | Merge "Update java doc for content rating systems" into lmp-devSungsoo Lim2014-10-011-1078/+181
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update java doc for content rating systemsSungsoo Lim2014-10-011-1078/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DVB and ISDB ratings are added. - Remove rating systems whose countries uses DVB and ISDB. - Updated java doc for AR, AU, and BR. Bug: 17494772 Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
* | | | | | | | | | | | camera2: Use valid dimensions for RGBA8888 gralloc buffers.Ruben Brunk2014-09-301-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17675571 - All of the mistakes were made. Unmake them. Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
* | | | | | | | | | | Merge "camera2: Fix native ImageReader test segfaults." into lmp-devRuben Brunk2014-09-271-4/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | camera2: Fix native ImageReader test segfaults.Ruben Brunk2014-09-261-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17675571 - Check for JPEG footer in correct location from ImageReader when using the RGBA override. - Add additional error checks in produceFrame method. - Avoid allocating extra space for jpeg buffers due to incorrect width calculations. Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
* | | | | | | | | | | | Assign bindService() result to a boolean directly. One less if-elseYao Chen2014-09-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17637058 Change-Id: If2f4db2ebf95f1912a752794a1ab482cf30ab014
* | | | | | | | | | | | Merge "Validate MTP path" into lmp-devMarco Nelissen2014-09-271-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Validate MTP pathMarco Nelissen2014-09-261-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17673184 Change-Id: I51a64f065d9b3609557af81e596ebeb8720ab6c5
* | | | | | | | | | | | | Don't forward media keys to the app if the phone session is activeRoboErik2014-09-263-0/+22
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checks if the phone app is currently getting or in a call when a media key event is sent and sends it to the phone session instead of the foreground app if it is. bug:17527302 Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
* | | | | | | | | | | | Merge "Disable MediaSessionLegacyHelper debugging" into lmp-devRoboErik2014-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Disable MediaSessionLegacyHelper debuggingRoboErik2014-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switched over to using Log.isLoggable instead for release. Change-Id: Iebd6871adb9994e23292953f14b6a997c83957a0
* | | | | | | | | | | | | Merge "Remove BT routes when BT is turned off" into lmp-devRoboErik2014-09-261-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Remove BT routes when BT is turned offRoboErik2014-09-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A behavior change in the BT stack caused it to stop sending connection changes for connected devices when you turn BT off. To work around this we need to remove the connected BT route when BT is turned off. bug:17512270 Change-Id: I3e5aa8863409c5abac51aa4e93a15f1978cf74b3
* | | | | | | | | | | | | Merge "Check the return value of bindService, and notify media browser ↵Yao Chen2014-09-261-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | client onConnectionFailed if it returns false." into lmp-dev