8900 Commits

Author SHA1 Message Date
Marco Nelissen
2c2415a552 am 3ea395dd: am 4e853598: Merge "Fix printf format"
* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
  Fix printf format
2015-01-27 20:33:09 +00:00
Marco Nelissen
6cd6110773 Fix printf format
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
2015-01-27 12:17:48 -08:00
Marco Nelissen
6e14c5705c am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"
* commit '99985d98c23b32acc0014031d7b88ee4eed21a4b':
  Make SoundPool use MediaCodec
2015-01-27 18:28:53 +00:00
Matthew Xie
e213c6813e am 46c3304a: am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev
* commit '46c3304aed2cabb592e499b0b3de56a312e1d67f':
  Delay the second message for 30ms more than the last message for a2dp
2015-01-27 18:22:57 +00:00
Matthew Xie
485813a00c Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 2015-01-27 18:13:40 +00:00
Marco Nelissen
e74da38e21 Merge "Make SoundPool use MediaCodec" 2015-01-27 17:49:02 +00:00
Mike Lockwood
2d1e078ac4 am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
* commit '5ac22aa60f773917981f42e64fbc28615871fd3e':
  MTP: Fix partial implementation of 5 new audio specific properties
2015-01-26 19:10:44 +00:00
Elliott Hughes
f51d65ade0 Merge "Add missing <string.h> includes." automerge: 82a1a2c
automerge: 86b48b3

* commit '86b48b3f8056a8efa6857d87dd4f30495e8b0464':
  Add missing <string.h> includes.
2015-01-25 19:27:25 +00:00
Elliott Hughes
35af2c3534 Add missing <string.h> includes.
Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
2015-01-25 08:33:36 -08:00
Marco Nelissen
372be8970c Make SoundPool use MediaCodec
Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
2015-01-23 12:49:36 -08:00
Mike Lockwood
7182774810 MTP: Fix partial implementation of 5 new audio specific properties
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
2015-01-23 10:58:38 -08:00
Matthew Xie
c525cf7a33 Delay the second message for 30ms more than the last message for a2dp
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
2015-01-22 20:54:54 -08:00
Christopher Tate
ebdec3e092 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev
automerge: 8192670

* commit '8192670937e3dee8e2c521a9ed1118a5782a2912':
  Don't launch broadcast receiver processes during boot
2015-01-20 23:55:00 +00:00
Christopher Tate
267603f3bb Don't launch broadcast receiver processes during boot
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
2015-01-20 14:21:21 -08:00
Jean-Michel Trivi
c2230a9d1a am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue."
* commit 'ef417bb7a06b0d58faa21f42599d7dd4fd9e3ff2':
  Prevent AudioService dead lock issue.
2015-01-16 17:37:29 +00:00
Jean-Michel Trivi
6a64a9cd26 Merge "Prevent AudioService dead lock issue." 2015-01-16 17:23:36 +00:00
Eric Laurent
c3fb94caf0 am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev
* commit '4772f8b841dc1ad50999e2cca3f1d366b325b915':
  AudioManager: make AudioPortEventHandler static
2015-01-15 22:21:58 +00:00
Eric Laurent
f076db4070 AudioManager: make AudioPortEventHandler static
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
2015-01-15 10:13:52 -08:00
Eric Laurent
e5a25a7689 am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev
automerge: 50085fb

* commit '50085fbccfd08038ba5ec888621d960dbbe21405':
  AudioService: handle stream mute by stream alias
2015-01-13 23:25:05 +00:00
Eric Laurent
4fb3b60215 AudioService: handle stream mute by stream alias
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
2015-01-13 12:19:53 -08:00
seunghwan.hong
4fe7795347 Prevent AudioService dead lock issue.
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
2015-01-13 08:22:26 +09:00
Eric Laurent
fe254b6ed2 am 695233fe: Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev
automerge: f672783

* commit 'f67278306b7f4c48f92113a8f1c1ace39c9b62e7':
  AudioService: send connection intent for HDMI ARC device
2015-01-12 16:29:59 +00:00
Eric Laurent
695233fe83 Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev 2015-01-12 15:39:45 +00:00
Rachad
2a7991ee2f am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev
automerge: b60bb35

* commit 'b60bb35650c7075bc66bf2b8f5c0fbe428092010':
  MediaCodec: Added E-AC3 mime type (@hide).
2015-01-10 01:31:01 +00:00
Rachad
6d3cff1264 Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 2015-01-10 01:23:35 +00:00
Lajos Molnar
7f94b52fc7 Merge "MediaCodec/Image: handle null cropRect correctly" 2015-01-10 01:12:33 +00:00
Lajos Molnar
98840f2bd2 Merge "media: add support for 160-byte image info in MediaCodec" 2015-01-10 01:10:24 +00:00
Eric Laurent
6fa4245589 AudioService: send connection intent for HDMI ARC device
Bug: 18921279.
Change-Id: I1e23b5aed7a2835feb0fea2a412f3622c01cbe55
2015-01-09 15:09:40 -08:00
Haitao Feng
67f304e2ca Use NULL instead of 0 when invoking CallStaticVoidMethod
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>
2015-01-08 19:09:22 +00:00
Narayan Kamath
031acc4b39 am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
* commit '3787decd8d41320ec9201405ec4cc893b2c99d78':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
2015-01-06 10:16:34 +00:00
Narayan Kamath
5137415e39 Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 2015-01-06 10:06:06 +00:00
Haitao Feng
8bd6a203ca Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
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
2015-01-06 09:57:13 +00:00
Narayan Kamath
b7974bd31d am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"
* commit 'dd65a4f735a311fe60c065449e394974807ff297':
  Race-condition in SoundPool during release
2015-01-05 18:08:06 +00:00
Narayan Kamath
ea4cdd4454 Merge "Race-condition in SoundPool during release" 2015-01-05 17:57:27 +00:00
John Spurlock
bbe3087ec0 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev
automerge: db41690

* commit 'db416907b831010cc2854292aa7de85fd8857a77':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
2014-12-28 05:42:43 +00:00
Jean-Michel Trivi
6fa5d8dab0 am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev
* commit '98ba8409876087f32114d889435b7f1bd7a73ffb':
  AudioRecord: filter attributes
2014-12-26 20:30:04 +00:00
John Spurlock
af84e073bc Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 2014-12-24 01:16:14 +00:00
Rachad
6564f5be74 MediaCodec: Added E-AC3 mime type (@hide).
Bug: 17883772
Change-Id: I48b2ab64812d860bb1a01d0a14e10690b86c4519
2014-12-23 16:12:44 -08:00
John Spurlock
af88a19165 Audio Policy: Clear calling identity for all paths setting ringer mode.
For proper appops bookkeeping and zen setting changes.

Bug: 18832923
Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
2014-12-23 16:14:44 -05:00
Jean-Michel Trivi
996af72b0c Merge "AudioRecord: filter attributes" into lmp-mr1-dev 2014-12-22 18:55:40 +00:00
Jean-Michel Trivi
43bcd8fa74 AudioRecord: filter attributes
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
2014-12-22 18:15:32 +00:00
Eric Laurent
b4185370d2 am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev
* commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3':
  AudioService: fix permission check.
2014-12-19 17:28:03 +00:00
Eric Laurent
8d24fe235a Merge "AudioService: fix permission check." into lmp-mr1-dev 2014-12-19 17:11:28 +00:00
Oliver Woodman
20e52c3453 am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev
* commit '9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5':
  MediaSessionLegacyHelper uses global Application context
2014-12-19 11:47:38 +00:00
Oliver Woodman
69fd01d3e6 Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 2014-12-19 11:37:04 +00:00
Eric Laurent
38edfda9bd AudioService: fix permission check.
Clear caller identity before calling TelecomManager.isInCall().

Bug: 18702149.
Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
2014-12-18 17:40:43 -08:00
Jean-Michel Trivi
9b5257c9c9 MediaSessionLegacyHelper uses global Application context
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
2014-12-18 16:42:59 -08:00
John Spurlock
09ab7d0663 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
* commit 'caba360367ea9900a48066f97f4b6e59877a9df6':
  Audio policy: Fix deprecated shouldVibrate api.
2014-12-17 20:23:55 +00:00
John Spurlock
57627794b6 Audio policy: Fix deprecated shouldVibrate api.
And apply zen mode immediately to avoid race conditions
in tests.

Bug: 18702149
Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
2014-12-17 12:34:00 -05:00
Ying Wang
cd69b5a2de am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16 20:57:35 +00:00