summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler ↵Eric Laurent2015-01-152-89/+91
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | static" into lmp-mr1-dev * commit '4772f8b841dc1ad50999e2cca3f1d366b325b915': AudioManager: make AudioPortEventHandler static
| * | | 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
* | | | am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into ↵Eric Laurent2015-01-131-10/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 50085fb * commit '50085fbccfd08038ba5ec888621d960dbbe21405': AudioService: handle stream mute by stream alias
| * | | 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
* | | | am 695233fe: Merge "AudioService: send connection intent for HDMI ARC ↵Eric Laurent2015-01-121-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | device" into lmp-mr1-dev automerge: f672783 * commit 'f67278306b7f4c48f92113a8f1c1ace39c9b62e7': AudioService: send connection intent for HDMI ARC device
| * | | 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
* | | | | am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-devRachad2015-01-101-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: b60bb35 * commit 'b60bb35650c7075bc66bf2b8f5c0fbe428092010': MediaCodec: Added E-AC3 mime type (@hide).
| * | | | 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
| * | | | | Use NULL instead of 0 when invoking CallStaticVoidMethodHaitao Feng2015-01-082-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static void CallStaticVoidMethod is variable argument function. if pass 0 to the function like: CallStaticVoidMethod(......, 0), 0 will be treated as INT data type.but in the CallStaticVoidMethod implement 0 will be treated as pointer data type.Pointer in 64bit system occupied 8 bytes, but in 64bit system int occupied 4 bytes. if call function like: CallStaticVoidMethod(......, 0), only low 4 bytes will be assigned 0.Turned out it actually call function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000). intent to pass NULL to function but passed non-NULL parameter to the function.this will cause GCDaemon crash. Bug: 18911458 Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments ↵Narayan Kamath2015-01-062-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | of CallStaticVoidMethod." * commit '3787decd8d41320ec9201405ec4cc893b2c99d78': Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
| * | | | Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."Narayan Kamath2015-01-062-2/+2
| |\ \ \ \
| | * | | | Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.Haitao Feng2015-01-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallStaticVoidMethod is varargs function, and calling it with a literal 0 like CallStaticVoidMethod(..., 0) will treat the argument as a 4 byte int in both 32 and 64 bit processes. This is incorrect for pointer arguments where NULL should be used instead. Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com> Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
* | | | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'dd65a4f735a311fe60c065449e394974807ff297': Race-condition in SoundPool during release
| * | | | | Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Race-condition in SoundPool during releaseDariusz Iwanoczko2014-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is race between SoundPoolThread and SoundPool / AudioManager threads during releasing SoundPool. AudioManager deletes a global reference before setting SoundPool callback to NULL. If, at that time, a call to the SoundPool::notify fuction happens then mCallback is valid but mUserData is not. The following log will show up to indicate the problem: JNI ERROR (app bug): accessed deleted global reference 0xXXXXXXXX This fix is to clear the SoundPool's callback before releasing global reference. Change-Id: I5e6d647edc0444340db879428048e2c0a068a8b4
* | | | | | am af84e073: Merge "Audio Policy: Clear calling identity for all paths ↵John Spurlock2014-12-281-32/+27
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting ringer mode." into lmp-mr1-dev automerge: db41690 * commit 'db416907b831010cc2854292aa7de85fd8857a77': Audio Policy: Clear calling identity for all paths setting ringer mode.
| * | | | | 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
* | | | | | am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into ↵Jean-Michel Trivi2014-12-261-6/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '98ba8409876087f32114d889435b7f1bd7a73ffb': AudioRecord: filter attributes
| * | | | | 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
* | | | | | am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into ↵Eric Laurent2014-12-191-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3': AudioService: fix permission check.
| * | | | | 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
* | | | | | am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global ↵Oliver Woodman2014-12-191-4/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Application context" into lmp-mr1-dev * commit '9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5': MediaSessionLegacyHelper uses global Application context
| * | | | | 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
* | | | | | am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate ↵John Spurlock2014-12-171-23/+35
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api." into lmp-mr1-dev * commit 'caba360367ea9900a48066f97f4b6e59877a9df6': Audio policy: Fix deprecated shouldVibrate api.
| * | | | | 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
* | | | | am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-163-15/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| * | | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-163-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18675947 Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
* | | | | am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon ↵Jinsuk Kim2014-12-131-10/+14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | calling HdmiControlService" into lmp-mr1-dev * commit 'd8858fa91712b5e5d2a832e1993b6e265dafcf39': audioservice: Clear calling identity upon calling HdmiControlService
| * | | | 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
* | | | | | am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" ↵Chong Zhang2014-12-121-3/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd4bef185a5057904f0e230ac8a2c5866e590094f': parse bitrate range for video/audio caps
| * | | | | Merge "parse bitrate range for video/audio caps" into lmp-mr1-devChong Zhang2014-12-121-3/+20
| |\ \ \ \ \
| | * | | | | parse bitrate range for video/audio capsChong Zhang2014-12-121-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18684228 Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
* | | | | | | am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both ↵Chih-hung Hsieh2014-12-115-6/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32-bit and 64-bit builds" * commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e': Adjust format strings to work on both 32-bit and 64-bit builds
| * | | | | | Merge "Adjust format strings to work on both 32-bit and 64-bit builds"Chih-hung Hsieh2014-12-115-6/+6
| |\ \ \ \ \ \
generated by cgit v1.1 at 2025-02-13 18:12:37 +0000