summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Check the return value of bindService, and notify media browser clientYao Chen2014-09-241-9/+14
| | | | | | | | | | | | | | | | | | | | | onConnectionFailed if it returns false. Bug: 17637058 Change-Id: I2284c3a982e5ac6323f51ff7d98aae7699c695e5
* | | Merge "Ensure MediaBrowser state is set to connecting after a reconnect" ↵RoboErik2014-09-251-0/+1
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | Ensure MediaBrowser state is set to connecting after a reconnectRoboErik2014-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the binder had disconnected we were setting the state to suspended and then not setting it back to connecting when we reconnected. This sets the state correctly when we are trying to connect again. bug:17593681 Change-Id: I3fe95fa23ba43ac2dc3692fd28309b2f8e5a3599
* | | | Merge "Allow null queues to be set in MediaSession" into lmp-devRoboErik2014-09-252-2/+3
|\ \ \ \ | |/ / /
| * | | Allow null queues to be set in MediaSessionRoboErik2014-09-242-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some test code for it to OneMedia. bug:17593962 Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
* | | | Merge "MediaCodecList: fix findEncoderForFormat." into lmp-devRonghua Wu2014-09-251-1/+1
|\ \ \ \
| * | | | MediaCodecList: fix findEncoderForFormat.Ronghua Wu2014-09-251-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 17460057 Bug: 17637188 Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
* | | | MediaCodec: revalidate cached queued input buffers if queue fails (2)Lajos Molnar2014-09-241-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the other ways queueBuffer can fail. Revalidate the buffers properly, e.g. without clearing them. Bug: 17630446 Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
* | | | Merge "MediaCodec: revalidate cached queued input buffers if queue fails" ↵Lajos Molnar2014-09-241-4/+14
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-dev
| * | | | MediaCodec: revalidate cached queued input buffers if queue failsLajos Molnar2014-09-241-4/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For legacy behavior (using getInputBuffers) input buffer needs to be made valid if queue fails. Otherwise, it becomes unusable, and the buffer still belongs to the user. In the new model, buffers obtained by getIn/OutputBuffer will become invalid even if queue/release fails. We do not do the same logic for output buffers, as these should not be accessed even if releaseBuffer fails (which really should not happen anyway unless codec is in bad state). Bug: 17630446 Change-Id: Ica72a168d8aea97a0ee3f3ef49c60d0ca5a9fa06
* | | | Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-242-19/+49
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | camera2: Hide JPEGs in RGBA gralloc buffers.Ruben Brunk2014-09-242-19/+49
| |/ | | | | | | | | | | | | | | | | Bug: 17379185 - WAR for SW Write usage flags being unavailable on certain devices for JPEG (blob) format buffers. Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
* | Merge "camera2: Update CamcorderProfile documentation." into lmp-devRuben Brunk2014-09-241-0/+36
|\ \ | |/ |/|
| * camera2: Update CamcorderProfile documentation.Ruben Brunk2014-09-241-0/+36
| | | | | | | | | | | | | | | | Bug: 17447258 - Update documentation in CamcorderProfile for LEGACY mode video handling. Change-Id: If65b93788a38ffe28caec053f81b9afa538c38a0
* | Merge "AudioRecord: add HW hotword capture flag" into lmp-devEric Laurent2014-09-241-1/+10
|\ \
| * | AudioRecord: add HW hotword capture flagEric Laurent2014-09-191-1/+10
| |/ | | | | | | | | Bug: 17575019. Change-Id: Ifa8b8342dffa12e1943b8f9105f6ab1fa4a2b1a6
* | Merge "Implement API review feedback." into lmp-devJeff Tinker2014-09-232-7/+10
|\ \
| * | Implement API review feedback.Jeff Tinker2014-09-232-7/+10
| |/ | | | | | | | | bug: 17607941 Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
* | SysUI: Correctly compare MediaControllersChristoph Studer2014-09-191-0/+8
|/ | | | | | | | | Instead of comparing MediaControllers via reference equality (which is never true), go deeper and check whether the two controllers are connected to the same IBinder. Bug: 17571414 Change-Id: Id25d70be0a60d1900e977310dedcc7063552e018
* Adjust volume bar visibility in HDMI-CEC system audio modeJungshik Jang2014-09-171-0/+10
| | | | | | | | | | | | | When HDMI-CEC system audio mode is activated. 1. Hide volume bar when volume button is pressed in TV 2. Show volume bar when TV receives volume notification from Audio Receiver. Otherwise, (system audio mode off) follows normal TV's behavior. Bug: 17347499 Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
* Add new DisconnectCause class to telecomm.Andrew Lee2014-09-161-0/+6
| | | | | | | | | | | | | | | | + Add a hidden "UNKNOWN" default type to ToneGenerator. - Hide the Telephony DisconnectCause from the public API. + Add a Telecomm DisconnectCause. This is parcelable, and contains information (code, user facing message, non-user facing reason, and tone) to help describe the disconnect state and what behaviors an application can implement for the user experience. This reduces the causes for a disconnect to a more generic set. + Lots of work to pipe this through. DisconnectCause replaces the code and message which were formerly passed around. Bug: 17241433 Bug: 17329632 Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
* Fix volume change failure in HDMI-CEC system audio mode.Jungshik Jang2014-09-161-0/+10
| | | | | | | | | | | | In order to get volume change event, output device should not be in fixed volume device. This change ignores CEC releated outputs if system audio mode is on. Along with this, fix invalid output from getStreamForDevice as AudioPolicManager does. Bug: 17502272 Change-Id: I7d4406caea7fa6617f17969dc61aabebb87ecf7d
* Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-devJeff Tinker2014-09-151-3/+6
|\
| * Document retry behavior for MediaCodec.CryptoExceptionJeff Tinker2014-09-151-3/+6
| | | | | | | | | | bug: 17469693 Change-Id: I8cc204938b28451c638be017ebb499f525fcff50
* | TIF: Turn debugging offJae Seo2014-09-142-4/+2
| | | | | | | | | | Bug: 17476383 Change-Id: I28ff54a635bf6468c231efe776dbc8e35460d542
* | Renaming Telecomm to Telecom.Tyler Gunn2014-09-121-5/+4
| | | | | | | | | | | | | | | | | | | | - Changing package from android.telecomm to android.telecom - Changing package from com.android.telecomm to com.android.server.telecomm. - Renaming TelecommManager to TelecomManager. Bug: 17364651 Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
* | Merge "more AudioAttributes javadoc" into lmp-devJean-Michel Trivi2014-09-121-3/+53
|\ \
| * | more AudioAttributes javadocJean-Michel Trivi2014-09-121-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | Expand the AudioAttributes and associated Builder javadoc. Bug 17059703 Change-Id: I81b8d48a3b5b3c203f02da3e37228e5ef7b5451d
* | | TIF: Add a system API to retrieve HDMI device informationJae Seo2014-09-121-8/+26
| | | | | | | | | | | | | | | Bug: 17487782 Change-Id: I53995735fa190c40819ff352a8b98765a6f7753f