Commit Graph

67336 Commits

Author SHA1 Message Date
James Dong
f91dc7dd96 am 8fdaf785: Merge "Change the signature of method addTextSource() in AwesomePlayer"
* commit '8fdaf785e2624f355c525c1370fe0837969e5072':
  Change the signature of method addTextSource() in AwesomePlayer
2012-02-10 17:59:22 -08:00
James Dong
8fdaf785e2 Merge "Change the signature of method addTextSource() in AwesomePlayer" 2012-02-10 17:57:16 -08:00
Wink Saville
cbf1b9725c am e4e04945: am 5caed1d9: am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit 'e4e04945e73ac06f7b39e07b9ba1d71339a2db49':
2012-02-10 17:03:21 -08:00
Wink Saville
e4e04945e7 am 5caed1d9: am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '5caed1d99b99a011501c532fbf970324ea82e13d':
2012-02-10 17:00:51 -08:00
Wink Saville
0819b191a0 am 92881551: Merge "resolved conflicts for merge of e8b57fea to master"
* commit '928815515481551c8318d5decc7009f00b82a511':
  Add OEM specific USB mode enumeration based on ro.bootmode property
2012-02-10 16:59:06 -08:00
Wink Saville
9288155154 Merge "resolved conflicts for merge of e8b57fea to master" 2012-02-10 16:57:39 -08:00
Wink Saville
41b564f354 resolved conflicts for merge of e8b57fea to master
Change-Id: I2ccf2b4cb73faadd0c8608cc21dda5db888d2937
2012-02-10 16:11:18 -08:00
Glenn Kasten
ead488d82f am ad8d175b: mAudioHwDevs and related cleanup
* commit 'ad8d175b405373b9614ad4278f274eae706df588':
  mAudioHwDevs and related cleanup
2012-02-10 15:39:17 -08:00
Glenn Kasten
ad8d175b40 mAudioHwDevs and related cleanup
Inline AudioFlinger::initCheck and remove unnecessary lock.

Remove redundant check of mAudioHwDevs.size().

No need to lock mHardwareLock for each device separately
during initialization.

Use size_t not int to loop through Vector, since size() returns size_t.

Add missing hardware lock for get_mic_mute() and get_input_buffer_size().

Add comments.

Change-Id: Iafae78ef78bbf65f703d99fcc27c2f4ff221aedc
2012-02-10 15:36:46 -08:00
Glenn Kasten
e6f55c3d73 am da639f54: Merge "Simplify ThreadBase::exit() aka requestExitAndWait"
* commit 'da639f54382d9342793a05aec59f179dd172bd57':
  Simplify ThreadBase::exit() aka requestExitAndWait
2012-02-10 15:34:02 -08:00
Glenn Kasten
a69ab5ac9f am 6f5f9ce7: Merge "Disable HQ resamplers for now until qualified"
* commit '6f5f9ce713b3ea58cbc71f3f4b02c2b694ce9dec':
  Disable HQ resamplers for now until qualified
2012-02-10 15:33:59 -08:00
Glenn Kasten
9df62e2802 am d335c1cc: Merge "Move header declarations around for clarity"
* commit 'd335c1cc4f9980d3fe2600876bd068ee5cb0002e':
  Move header declarations around for clarity
2012-02-10 15:33:57 -08:00
Glenn Kasten
17f7228eeb am 3ebf95bb: Merge "Camel case readability & private disconnect(bool)"
* commit '3ebf95bb52c94d641fe8e49a7767dc73b1695ac7':
  Camel case readability & private disconnect(bool)
2012-02-10 15:33:55 -08:00
Glenn Kasten
8e270e13f9 am 2a67e1a6: Merge "Remove aliasing"
* commit '2a67e1a6c037ea170958da754a1c8a5d4375ac06':
  Remove aliasing
2012-02-10 15:33:52 -08:00
Glenn Kasten
f898f78928 am 5bb3090a: Merge "Use mul from audioutils"
* commit '5bb3090a18ce7d5b8910b8394516efc5fba7b817':
  Use mul from audioutils
2012-02-10 15:33:49 -08:00
Glenn Kasten
79740b3039 am 52ee6350: Merge "Mark fields const if only set in constructor"
* commit '52ee6350390ccbe000b9bf8c2637a968d7951c33':
  Mark fields const if only set in constructor
2012-02-10 15:33:47 -08:00
Glenn Kasten
da639f5438 Merge "Simplify ThreadBase::exit() aka requestExitAndWait" 2012-02-10 15:32:16 -08:00
Glenn Kasten
6f5f9ce713 Merge "Disable HQ resamplers for now until qualified" 2012-02-10 15:31:54 -08:00
Glenn Kasten
d335c1cc4f Merge "Move header declarations around for clarity" 2012-02-10 15:31:07 -08:00
Mike Lockwood
516da34092 am c199e2c7: Merge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a3,I20963df8,I01060b08,I7dc29739,I5c55a051,Ia07aa3c4,I3194ea94,I0dc37cce,Ic3a7bb65,I0a7eaecf,Ifa7b0614,Ice952c8e,Ia5abdb9e,Ifcb310f9,If5f4ec97,I4767690f,I79824179,I6e0f981e,Id60ae7f6
* commit 'c199e2c7e0f8895273fdd912c5c88495a8b30e35': (24 commits)
  EthernetDataTracker: Don't run DHCP or set network available until link is up
  Only send master volume or mute updates if the settings have changed
  Make AudioManager.adjustMasterVolume public and hidden
  Allow disabling network stats support in a resource overlay
  Restore persisted master volume if the media server restarts
  Don't allow changing master volume when muted
  Show the flags in package manager debugging.
  Modified the constructor of EndpointBase
  Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes
  Defer persisting master data to avoid excessive database writes
  Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
  Remove reference counting and client death notification for master mute
  AudioService: Send broadcasts when master volume and mute state change
  Use the new get/putFlattenable methods on RpcData.
  Don't try to unmarshal void return types when there are out parameters being returned.
  AudioManager: Add wrapper methods for master volume support
  AudioManager: Add support for master mute
  NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
  For events, require that the parameters be marked in.
  PhoneWindowManager: stifle warning that ITelephony service does not exist
  ...
2012-02-10 15:30:58 -08:00
Svetoslav Ganov
01fdbf5c88 am 0ee0969f: Merge "UI automation service disconnected upon package change."
* commit '0ee0969ffb92d40c290c9da9bfc6f2cd5b1ba3aa':
  UI automation service disconnected upon package change.
2012-02-10 15:30:52 -08:00
Alex Sakhartchouk
ff3de0e5d9 am 87a36a3b: Merge "Making shader compilation errors throw a Java exception."
* commit '87a36a3b291e78a612d2d08c14b245ff970080e0':
  Making shader compilation errors throw a Java exception.
2012-02-10 15:30:48 -08:00
Amith Yamasani
aa21b7c1bc am f0451db4: Merge "Multi-user - wallpaper service"
* commit 'f0451db4224e2b6360efa39cd65c88cd391f14e0':
  Multi-user - wallpaper service
2012-02-10 15:30:45 -08:00
James Dong
c209047bf6 am 385f1caf: Merge "Move away from MediaDebug and use ADebug instead"
* commit '385f1cafa6e55d2f4b8846746fe7fe4e8755aedd':
  Move away from MediaDebug and use ADebug instead
2012-02-10 15:30:39 -08:00
Glenn Kasten
3ebf95bb52 Merge "Camel case readability & private disconnect(bool)" 2012-02-10 15:30:15 -08:00
Glenn Kasten
2a67e1a6c0 Merge "Remove aliasing" 2012-02-10 15:29:35 -08:00
Glenn Kasten
5bb3090a18 Merge "Use mul from audioutils" 2012-02-10 15:28:57 -08:00
Wink Saville
5caed1d99b am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit 'f11b6fbfc8bab9a09e37ef9866c0da247474f4cf':
2012-02-10 15:28:54 -08:00
Glenn Kasten
52ee635039 Merge "Mark fields const if only set in constructor" 2012-02-10 15:28:45 -08:00
Jason Sams
b2a5354f0c resolved conflicts for merge of cb66aec0 to graphics-dev
Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
2012-02-10 15:27:26 -08:00
Mike Lockwood
c199e2c7e0 Merge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a3,I20963df8,I01060b08,I7dc29739,I5c55a051,Ia07aa3c4,I3194ea94,I0dc37cce,Ic3a7bb65,I0a7eaecf,Ifa7b0614,Ice952c8e,Ia5abdb9e,Ifcb310f9,If5f4ec97,I4767690f,I79824179,I6e0f981e,Id60ae7f6
* changes:
  EthernetDataTracker: Don't run DHCP or set network available until link is up
  Only send master volume or mute updates if the settings have changed
  Make AudioManager.adjustMasterVolume public and hidden
  Allow disabling network stats support in a resource overlay
  Restore persisted master volume if the media server restarts
  Don't allow changing master volume when muted
  Show the flags in package manager debugging.
  Modified the constructor of EndpointBase
  Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes
  Defer persisting master data to avoid excessive database writes
  Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
  Remove reference counting and client death notification for master mute
  AudioService: Send broadcasts when master volume and mute state change
  Use the new get/putFlattenable methods on RpcData.
  Don't try to unmarshal void return types when there are out parameters being returned.
  AudioManager: Add wrapper methods for master volume support
  AudioManager: Add support for master mute
  NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
  For events, require that the parameters be marked in.
  PhoneWindowManager: stifle warning that ITelephony service does not exist
  AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.
  Support putting Flattenables in Lists.
  Was generating code that uses the wrong RpcData.
  store the hw addr in the extraInfo field of ethernet NetworkInfos
2012-02-10 15:26:36 -08:00
Wink Saville
e8b57feaab am 812c2ff6: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '812c2ff6312b25b9539399f38967f8a6ff40b733':
  Add OEM specific USB mode enumeration based on ro.bootmode property
2012-02-10 15:17:12 -08:00
Wink Saville
f11b6fbfc8 am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property
2012-02-10 15:14:40 -08:00
Wink Saville
812c2ff631 am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1
* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property
2012-02-10 15:14:40 -08:00
Svetoslav Ganov
0ee0969ffb Merge "UI automation service disconnected upon package change." 2012-02-10 15:13:26 -08:00
Wink Saville
197fe26940 Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 2012-02-10 15:12:19 -08:00
Glenn Kasten
761286f65b Simplify ThreadBase::exit() aka requestExitAndWait
We can remove mExiting and use Thread::exitPending() instead.

The local sp<> on "this" in exit() is not needed, since the caller must
also hold an sp<> in order to be calling us. (Unless it was using a raw
pointer, but that would be dangerous for other reasons.)

Add comment explaining the mLock in exit().

Change-Id: I319e5107533a1a7cdbd13c292685f3e2be60f6c4
2012-02-10 15:02:44 -08:00
Alex Sakhartchouk
87a36a3b29 Merge "Making shader compilation errors throw a Java exception." 2012-02-10 15:00:21 -08:00
Svetoslav Ganov
9b666d0faa UI automation service disconnected upon package change.
1. The AccessibilityManagerService used to disable the IU
   automation service on package change. This behavior
   was incorrect since the automation service has to
   survive package installations.

bug:5975207

Change-Id: Idb5e76d02625c333a5842a6b5c5bc90c9b9634c9
2012-02-10 14:55:45 -08:00
Mike Lockwood
efeba018bd EthernetDataTracker: Don't run DHCP or set network available until link is up
Previously we were starting DHCP as soon as the interface was added,
which is at boot on devices with builtin ethernet.

Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:08 -08:00
Jason Simmons
1ce5b26d70 Only send master volume or mute updates if the settings have changed 2012-02-10 14:44:08 -08:00
Jason Simmons
e3f5979307 Make AudioManager.adjustMasterVolume public and hidden 2012-02-10 14:44:08 -08:00
Mike Lockwood
d3c5e1eca1 Allow disabling network stats support in a resource overlay
Bug: 5771240

Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:08 -08:00
Mike Lockwood
9063154a79 Restore persisted master volume if the media server restarts
Bug: 5755071

Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:08 -08:00
Mike Lockwood
b7bd88a3b6 Don't allow changing master volume when muted
Bug: 5793021

Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:07 -08:00
Joe Onorato
20963df86f Show the flags in package manager debugging. 2012-02-10 14:44:07 -08:00
Manuel Roman
01060b08fb Modified the constructor of EndpointBase
We introduced changes to the Endpoint lifecycle.
Modified the AIDL compiler to take into account the
changes. Just affected the constructor, which needs
now an extra parameter: placeInfo
2012-02-10 14:44:07 -08:00
Jason Simmons
7dc2973951 Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes 2012-02-10 14:44:07 -08:00
Mike Lockwood
5c55a051ad Defer persisting master data to avoid excessive database writes
Bug: 5705192

Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-10 14:44:07 -08:00
Jason Simmons
a07aa3c4c7 Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
HDMI audio hotplug is treated as a "headset" in the audio services.  When a headset is unplugged,
WiredAccessoryObserver sends an AUDIO_BECOMING_NOISY broadcast so that applications can take
appropriate action (e.g. pausing audio if headphones were unplugged).

However, on Tungsten, when you unplug HDMI audio, the Music2 service was getting the NOISY intent
and pausing the transmitter media player.  We could add Tungsten-specific code to Music2 to
disable this behavior, but it's probably better to disable this broadcast entirely because
applications on Tungsten probably shouldn't treat HDMI hotplug in the same way they treat
headphone hotplug on phones.
2012-02-10 14:44:07 -08:00