summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Frameworks/base: Use equals for Integer comparisonAndreas Gampe2015-03-153-5/+7
| | | | | | | | | | | Integer == is dangerous, as equal objects may not be identical objects. In fact, MediaFormat.setInteger was creating a new object every time. Change MediaFormat.setInteger and setLong to use valueOf, which may reuse returned objects. Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
* Fix context leakMarco Nelissen2015-03-111-35/+44
| | | | | | | | | | | Using an activity context with AudioManager could cause that context to be held on to longer than desired, for example if the caller acquired audio focus but never abandoned it. Fix acquire/abandon in VideoView, and use the application context in AudioManager to mitigate the issue for other misbehaving code. Bug: https://code.google.com/p/android/issues/detail?id=152173 Change-Id: I0fb8390207422c784800dda25b1f2c03d4574bcd
* am 3d333c74: Merge "Fix typos in AudioManager javadoc"Narayan Kamath2015-03-101-1/+1
|\ | | | | | | | | * commit '3d333c745f928ca1595aca111d9938fa3cf3e282': Fix typos in AudioManager javadoc
| * Fix typos in AudioManager javadocEemi Haukkala2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | The ACTION_HDMI_AUDIO_PLUG constant's description had spelled "HDMI" as "HMDI" and was missing a period. Fixes issue 93726. Change-Id: Idfd5352dba022afcd81bc9e50864fc6e95c661db Signed-off-by: Eemi Haukkala <eemi.haukkala@gmail.com>
* | am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | automerge: eceae03 * commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a': reset col position to 1 on row PAC
| * \ Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
| |\ \
| | * | reset col position to 1 on row PACChong Zhang2015-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | bug: 19284568 Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
* | | | am 015fdf39: Merge "audio: allow audio port cache update even when audio ↵Wonsik Kim2015-02-031-7/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | patches contain invalidated sources/sinks" into lmp-mr1-dev automerge: d7310bd * commit '015fdf392388f1bed3298f9f44012c1a82d7c1a1': audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
| * | | audio: allow audio port cache update even when audio patches contain ↵Wonsik Kim2015-01-311-7/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalidated sources/sinks When an audio device disconnects from Android, custom audio patches containing the device become invalidated. AudioManager::updateAudioPortCache() used to fail in that case, but it causes onAudioPortListUpdated() event never gets called so that the creator of the custom audio patch cannot update it. Let updateAudioPortCached() succeed even in the case so that the entity that created the audio patch can get notified. Bug: 18909299 Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
* | | Merge "ImageReader: add support for compatible flexYUV buffers" into ↵Lajos Molnar2015-01-291-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00 * commit '2a8dc00eedeb2b8a9fa3560d8afa4cfd7c17d395': ImageReader: add support for compatible flexYUV buffers
| * | ImageReader: add support for compatible flexYUV buffersLajos Molnar2015-01-281-0/+5
| | | | | | | | | | | | | | | Bug: 17906609 Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
* | | am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the ↵Jae Seo2015-01-291-9/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | session is already released * commit '4b1e5814d18dae8f2581cf702da4b4e1de0c3eb4': TIF: Do not call session callbacks when the session is already released
| * | TIF: Do not call session callbacks when the session is already releasedJae Seo2015-01-281-9/+27
| | | | | | | | | | | | | | | Bug: 19146382 Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
* | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-271-7/+33
|\ \ \ | | |/ | |/| | | | | | | * commit '99985d98c23b32acc0014031d7b88ee4eed21a4b': Make SoundPool use MediaCodec
| * | Make SoundPool use MediaCodecMarco Nelissen2015-01-231-7/+33
| | | | | | | | | | | | | | | Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
* | | am 46c3304a: am 485813a0: Merge "Delay the second message for 30ms more than ↵Matthew Xie2015-01-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | the last message for a2dp" into lmp-mr1-dev * commit '46c3304aed2cabb592e499b0b3de56a312e1d67f': Delay the second message for 30ms more than the last message for a2dp
| * | Merge "Delay the second message for 30ms more than the last message for ↵Matthew Xie2015-01-271-1/+1
| |\ \ | | | | | | | | | | | | a2dp" into lmp-mr1-dev
| | * | Delay the second message for 30ms more than the last message for a2dpMatthew Xie2015-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In function setBluetoothA2dpDeviceConnectionState, current code calculate the delay of the second state update message to be exactly the same as the last delayed messages. This causes a problem that the sequence of the messages may be altered. Bug: 19036411 Change-Id: I35762873fd3341ec098dd229ac96bd42d6f34195
* | | | am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new ↵Mike Lockwood2015-01-262-39/+51
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | audio specific properties" into lmp-mr1-dev * commit '5ac22aa60f773917981f42e64fbc28615871fd3e': MTP: Fix partial implementation of 5 new audio specific properties
| * | | MTP: Fix partial implementation of 5 new audio specific propertiesMike Lockwood2015-01-232-39/+51
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change Ic5b3fb75309893caae1a4f4b56068a543847f1f7, we added partial support for the MTP properties: MTP_PROPERTY_AUDIO_WAVE_CODE, MTP_PROPERTY_BITRATE_TYPE MTP_PROPERTY_AUDIO_BITRATE MTP_PROPERTY_NUMBER_OF_CHANNELS MTP_PROPERTY_SAMPLE_RATE However we were not returning any values for these properties in the result of the MTP GetObjectPropList command. Strangely, this triggers a nasty bug in Windows 7 that results in data loss. When copying a directory containing several MP3 files from one location on the device to another, Windows will copy only some of the files to the new location, but delete all of the originals. Finishing the implementation of these new object properties for some unknown reason stops this bad behavior in Windows 7. Bug: 19018427 Change-Id: I5fd3b91a89b31827d3100686445cef6795fe0f3f
* | | am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" ↵Christopher Tate2015-01-201-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 8192670 * commit '8192670937e3dee8e2c521a9ed1118a5782a2912': Don't launch broadcast receiver processes during boot
| * | Don't launch broadcast receiver processes during bootChristopher Tate2015-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadcasts that might be sent before the boot process has completed must be restricted to registered receivers, at least while still in the middle of booting. Bug 19060618 Change-Id: Ib4e0990cf252f34344f7a0bd19a0e72919013e0f
* | | am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue."Jean-Michel Trivi2015-01-161-9/+10
|\ \ \ | |/ / |/| / | |/ | | * commit 'ef417bb7a06b0d58faa21f42599d7dd4fd9e3ff2': Prevent AudioService dead lock issue.
| * Merge "Prevent AudioService dead lock issue."Jean-Michel Trivi2015-01-161-9/+10
| |\
| | * Prevent AudioService dead lock issue.seunghwan.hong2015-01-131-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dead lock sequence: 1. called onSetA2dpConnectionState() 1-1. synchronized(mConnectedDevices) 2. called onServiceDisconnected() 2-1. synchronized(mA2DPAvrcpLock) 3. waiting to lock(mConnectedDevices) in onServiceDisconnected() 4. waiting to lock(mA2DPAvrcpLock) in onSetA2dpConnectionState() ======================================================================================== - watchdog issue ----- pid 3306 at 2014-10-14 16:15:12 ----- Cmd line: system_server "main" prio=5 tid=1 MONITOR - waiting to lock <0x4343e9b0> (a java.util.HashMap) held by tid=46 (AudioService) at android.bluetooth.BluetoothA2dp$2.onServiceDisconnected(BluetoothA2dp.java:529) "AudioService" prio=5 tid=46 MONITOR - waiting to lock <0x42ab7a58> (a java.lang.Object) held by tid=1 (main) ======================================================================================== Signed-off-by: Seunghwan Hong <seunghwan.hong@lge.com> Change-Id: I99e061c07be01aabcd26786ef2ebb71f46717b93
| * | Merge "MediaCodec/Image: handle null cropRect correctly"Lajos Molnar2015-01-102-6/+10
| |\ \
| | * | MediaCodec/Image: handle null cropRect correctlyLajos Molnar2014-12-042-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow Media.Image.setCropRect(null) to unset cropRect - use full image if cropRect is null in MediaCodec$Image Bug: 18124320 Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
| * | | Merge "media: add support for 160-byte image info in MediaCodec"Lajos Molnar2015-01-101-4/+4
| |\ \ \ | | |_|/ | |/| |
| | * | media: add support for 160-byte image info in MediaCodecLajos Molnar2014-12-041-4/+4
| | |/ | | | | | | | | | | | | | | | | | | Some 64-bit compilers now create 160-byte image structures. Bug: 18513091 Change-Id: I355714affaac0fde0b03578d13ab8f373dd5aa81
| * | Merge "media: fix isSupportedFormat for integer frame rate"Lajos Molnar2014-12-081-4/+4
| |\ \
| | * | media: fix isSupportedFormat for integer frame rateLajos Molnar2014-12-041-4/+4
| | |/ | | | | | | | | | | | | Bug: 18473065 Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
| * | media: allow full range of Vorbis sampling ratesLajos Molnar2014-12-041-1/+1
| |/ | | | | | | | | Bug: 18615604 Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
* | AudioManager: make AudioPortEventHandler staticEric Laurent2015-01-152-89/+91
| | | | | | | | | | | | | | | | | | | | | | Make AudioPortEventHandler and audio port and patch caches static members of AudioManager. There is only one callback per process in AudioSystem for audio port updates and having those non static would not work when more than one AudioManager instance exists in one app. Bug: 18727023. Change-Id: I4c1041dc6441d168be4efa066e14289cc5f41872
* | AudioService: handle stream mute by stream aliasEric Laurent2015-01-131-10/+16
| | | | | | | | | | | | | | | | | | | | Handle stream mute/unmute requests at the stream alias level (like is done volume changes) to be consistent. E.g a request to mute/unmute a stream will affect all streams sharing the same alias for volume management. Bug: 18844550. Change-Id: Ie2e463c58df0371589150f0ebb9b36c38b14e1be
* | Merge "AudioService: send connection intent for HDMI ARC device" into ↵Eric Laurent2015-01-121-2/+4
|\ \ | | | | | | | | | lmp-mr1-dev
| * | AudioService: send connection intent for HDMI ARC deviceEric Laurent2015-01-091-2/+4
| | | | | | | | | | | | | | | Bug: 18921279. Change-Id: I1e23b5aed7a2835feb0fea2a412f3622c01cbe55
* | | Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-devRachad2015-01-101-0/+4
|\ \ \ | |/ / |/| |
| * | MediaCodec: Added E-AC3 mime type (@hide).Rachad2014-12-231-0/+4
| | | | | | | | | | | | | | | Bug: 17883772 Change-Id: I48b2ab64812d860bb1a01d0a14e10690b86c4519
* | | Merge "Audio Policy: Clear calling identity for all paths setting ringer ↵John Spurlock2014-12-241-32/+27
|\ \ \ | |/ / |/| | | | | mode." into lmp-mr1-dev
| * | Audio Policy: Clear calling identity for all paths setting ringer mode.John Spurlock2014-12-231-32/+27
| | | | | | | | | | | | | | | | | | | | | For proper appops bookkeeping and zen setting changes. Bug: 18832923 Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
* | | Merge "AudioRecord: filter attributes" into lmp-mr1-devJean-Michel Trivi2014-12-221-6/+11
|\ \ \ | |/ / |/| |
| * | AudioRecord: filter attributesJean-Michel Trivi2014-12-221-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating an AudioRecord instance, filter the tags in the AudioAttributes to remove tags that are handled at the Java layer. Bug: 18733215 Bug: 18736417 Change-Id: I16a3497742086deced4e8677bd6231290396c5f6
* | | Merge "AudioService: fix permission check." into lmp-mr1-devEric Laurent2014-12-191-0/+3
|\ \ \
| * | | AudioService: fix permission check.Eric Laurent2014-12-181-0/+3
| |/ / | | | | | | | | | | | | | | | | | | Clear caller identity before calling TelecomManager.isInCall(). Bug: 18702149. Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
* | | Merge "MediaSessionLegacyHelper uses global Application context" into ↵Oliver Woodman2014-12-191-4/+1
|\ \ \ | |/ / |/| | | | | lmp-mr1-dev
| * | MediaSessionLegacyHelper uses global Application contextJean-Michel Trivi2014-12-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaSessionLegacyHelper used a Context passed by an application which can cause a leak of Activity instances. Use the global Application context instead. Also prevent crash if a null Context is supplied (method not documented as requesting a non-null Context). Bug 18767503 Change-Id: I8281047d0af233a323f3fc11ababedff848829ec
* | | Audio policy: Fix deprecated shouldVibrate api.John Spurlock2014-12-171-23/+35
|/ / | | | | | | | | | | | | | | And apply zen mode immediately to avoid race conditions in tests. Bug: 18702149 Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
* | Merge "audioservice: Clear calling identity upon calling HdmiControlService" ↵Jinsuk Kim2014-12-131-10/+14
|\ \ | | | | | | | | | into lmp-mr1-dev
| * | audioservice: Clear calling identity upon calling HdmiControlServiceJinsuk Kim2014-12-131-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | This makes sure that accessing the HdmiControlService via audio service should be possible without the system permission. Bug: 18730526 Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
* | | Merge "parse bitrate range for video/audio caps" into lmp-mr1-devChong Zhang2014-12-121-3/+20
|\ \ \