67725 Commits

Author SHA1 Message Date
Glenn Kasten
afe9833de9 Fixed possible heap corruption in EffectDesc
"EffectDesc *effect = new EffectDesc(*effects[i]);" was relying on the
default copy constructor for EffectDesc, but the default copy constructor
does a member-by-member copy.  This works OK for mUuid, but a member
copy of mName and mParams shares pointers.  This could result in heap
corruption later on due to a double free.  Changed to add an explicit
copy constructor that does a deep copy of both mName and mParams.

A malloc() and strdup() were being freed by delete, but the correct
matching API for these is free().  Fortunately our current memory runtime
implementation ignores the difference. Changed to use free().

EffectDesc and InputSourceDesc member fields were being torn down by
the code that does delete.  Changed to do the tear-down in ~EffectDesc()
and ~InputSourceDesc().

Added constructor EffectDesc() with name and UUID parameters, rather
than having caller fill in the object after construction.

Made ~EffectDesc() and ~InputSourceDesc() non-virtual to save memory,
since they have no subclasses.

Change-Id: Ibb5cc2e6760d72e0c4cf537068ac4432c717bafd
2012-02-16 16:57:44 -08:00
Fabrice Di Meglio
9efedcbbab Merge "Fix Javadoc for View" 2012-02-16 15:50:39 -08:00
Fabrice Di Meglio
069bbe79fb Fix Javadoc for View
Change-Id: Iccae458320273253637017c6f32329150bae479e
2012-02-16 15:49:18 -08:00
Amith Yamasani
3c3155abea Merge "Fix Power Control widget" 2012-02-16 15:48:14 -08:00
John Grossman
06c51e2f48 Merge "Really fix the build this time." 2012-02-16 15:28:44 -08:00
John Grossman
ba2ff9c223 Really fix the build this time.
Cannot try to include <limits> on git_master-without-vendor.  The file
just does not exist.

Change-Id: Iae383465c59d1cf59a9ba3f729f8f074971f7ce4
2012-02-16 15:25:51 -08:00
Selim Gurun
e800892c4b Merge "Act on credential storage updates." 2012-02-16 15:13:12 -08:00
Amith Yamasani
67cf7d314b Fix Power Control widget
Some changes in AppWidgetService were interfering with widget permissions.

Added some hidden methods in Context to communicate the requesting user
information instead of using the calling uid.

Bug: 6019296
Change-Id: I5e519fd3fbbfa5b3fcc5c297b729c671dac8e7c7
2012-02-16 15:03:42 -08:00
John Grossman
27526f236a Merge "Fix the build." 2012-02-16 14:57:54 -08:00
John Grossman
b8525e9a76 Fix the build.
Looks like not all flavors of the android build include support for
std::numeric_limits.  Fix the build by using a simple macro for now.
A more elegant solution can be searched for once the build is green
again.

Change-Id: I18329cd0d26ca69de6a52df9a1c6eeb3ba063b48
2012-02-16 14:56:08 -08:00
Dianne Hackborn
7729a8c48b am e669d666: am 1db7eeac: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit 'e669d6666ae0c41742716bc2564266c1bab3f855':
2012-02-16 14:48:53 -08:00
Dianne Hackborn
a3b5f6c29b am 804aa297: am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '804aa297950949985882e4841303cd6e12fae06e':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:48:48 -08:00
Dianne Hackborn
e669d6666a am 1db7eeac: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '1db7eeac74d1455991e1dc0f532b47276d0c679c':
2012-02-16 14:46:41 -08:00
Dianne Hackborn
804aa29795 am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '01810bbb67b7af741b0dde0d7ccdadb76a46ed63':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:45:57 -08:00
Dianne Hackborn
1db7eeac74 am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:44:03 -08:00
Dianne Hackborn
01810bbb67 am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '06a591cdd6d90600db006906d5d1524d156d6529':
  Fix last change -- don't call startInputInner() with lock held.
2012-02-16 14:43:43 -08:00
Fabrice Di Meglio
2367706473 Merge "Add View.onResolvePadding() as a public API" 2012-02-16 14:36:28 -08:00
Selim Gurun
93ba4fedeb Act on credential storage updates.
Bug: 6009802

Cherry pick fcd93b72a3dde2b20fa0d8b04d3f47311b0856a1
Listen to credential storage updates and clean state when necessary.

Change-Id: I2c63e6771e9373da8b39781fdcf3d21583c4e3b2
2012-02-16 14:24:10 -08:00
Svetoslav Ganov
b9345b9496 Merge "Fixing the build." 2012-02-16 14:18:46 -08:00
Svetoslav Ganov
09ff963b08 Fixing the build.
Change-Id: I9ba599adea16b68c3c3af166a2845979624aef80
2012-02-16 14:10:36 -08:00
John Grossman
d72031cee3 Upintegreate AAH TX and RX players from ICS_AAH
Upintegrate the android at home TX and RX players developed in the
ICS_AAH branch.

Change-Id: I8247d3702e30d8b0e215b31a92675d8ab28dccbb
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:12 -08:00
John Grossman
4fbe95ede2 Fix a segfault in AudioFlinger.
Check the string returned by a HAL's implementation of get_parameters
for NULL before attempting to make use of it.  That way, we won't
bring down the mediaserver because of a poorly written HAL.

Change-Id: Ic99d7b004520d7d6347842a681c0595e889b68ea
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:12 -08:00
John Grossman
3540a0197f Enhance Visualizer behavior in the case of mediaserver death.
Bring the Visualizer class into line with the SDK documentation by
returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when
the Visualizer loses its binder connection to the mediaserver because
of a mediaserver restart.

Also add a new callback interface to allow clients to be
asynchronously notified in the case of server death.  Right now, the
interface definition and the registration method are flagged as hidden
pending API council review/approval.

See http://b/issue?id=5717519 for details.

Change-Id: Ic15856f27ed5a950a583ac11ca81f79bd7e9b1a0
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:11 -08:00
John Grossman
449725f9aa Reuse callback buffers in the Visualizer.
Don't re-allocate buffers used by Visualizer callbacks as this causes an
unacceptable amount of GC thrash.  Instead, lazily allocate the buffers and only
reallocate them when the required size changes.

See http://b/issue?id=5717519 for details.

Change-Id: Ibd157ed51f30687ce7c4ef0b4003258a484e0f5d
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:11 -08:00
John Grossman
d8cf2960d0 Upintegrate Audio Flinger changes from ICS_AAH
Bring in changes to audio flinger made to support timed audio tracks
and HW master volume control.

Change-Id: Ide52d48809bdbed13acf35fd59b24637e35064ae
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:11 -08:00
John Grossman
c157673a59 Add the CommonTimeManagementService.
Add a small service to the high level core set of system services to
control the configuration of the native common time service.  This
service is responsible for controlling policy regarding when the
common time service should be allowed to run, which networks it is
allowed to run on, what priority it runs at in the master election
algorithm, and so on.

Change-Id: I1fcd834c0286aea0df9557520693a3f42de59d69
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:10 -08:00
John Grossman
37237839e8 Add Java interfaces to the common_time services.
Add classes to handling binder marshalling to and from the native
common_time interfaces (config and clock)

Change-Id: I04fc429d9af27736c4f7f9b5468011ffdd4d7eaa
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:10 -08:00
Mike J. Chen
6c92951047 Upintegrate the common_time service from ics-aah.
Move the common_time service developed in the ics-aah branch back into
master.

The common_time service is a small service build to synchronize an
arbitrary timeline amongst peers on a local sub-net.  While running
and configured, the service will elect a master from the set of
available devices within the subnet, define a relationship between the
common_time timeline the local time timeline (provided by the local
time HAL), and then attempt to maintain synchronization between common
and local time by controlling the frequency of the local time clock
via the HAL, or by disciplining local time in the digital domain if
the local time HAL implementation does not support HW slewing.

On its own, the native common time service will do nothing until it is
configured.  The CommonTimeManagementService (running out of the
system server process) is responsible for implementing policy
regarding configuration and operation of the common_time service and
will be added in a subsequent CL.

Change-Id: I71292f9b9b1797665865689c4572c9d3a0552f64
Signed-off-by: John Grossman <johngro@google.com>
2012-02-16 13:45:10 -08:00
Svetoslav Ganov
cb46d80d21 Merge "Adding shell commands for modifying content." 2012-02-16 13:06:29 -08:00
The Android Open Source Project
e36f19a1a5 am 9f782852: am e113e793: Reconcile with ics-mr1-release
* commit '9f782852900fa02c41f825572bf45bd8bd247852':
2012-02-16 11:25:37 -08:00
The Android Open Source Project
f89c266182 am 54b67e23: am 9777fb10: Reconcile with ics-mr1-release
* commit '54b67e23e9d7a42768598c72a287370a0f433791':
2012-02-16 11:25:16 -08:00
Justin Ho
bee417ac6c am f581e486: am eefef982: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'f581e4868b3443c6ee9a463a879ed398fb3648c9':
2012-02-16 11:25:01 -08:00
Justin Ho
cf973fd9b9 am 8ff0c4cb: am 727ba648: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit '8ff0c4cb320110e4f2d682ef352ef3eb6e0296c8':
2012-02-16 11:24:59 -08:00
Justin Ho
884be41bb3 am c3132a0b: am ac18f89c: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'c3132a0b1ec23956ada3def4d5702f6149c68336':
  Update WiMAX notification icons Bug: 5724605
2012-02-16 11:24:57 -08:00
Dianne Hackborn
06a591cdd6 Fix last change -- don't call startInputInner() with lock held.
Change-Id: Ie7a145c5a07f08ae8a3f5954a1c389bfbd946b69
2012-02-16 10:37:06 -08:00
Eric Laurent
c54d1afbdb Merge "Fix music volume regression on tablets" 2012-02-16 10:30:51 -08:00
Mike Lockwood
3d89455629 Merge "WifiStateTracker: add support for overriding DCHP max retry count in an overlay" 2012-02-16 10:15:32 -08:00
Mike Lockwood
98b33ff6ba Merge "Remove airplane mode related wifi test for Wi-Fi only devices." 2012-02-16 10:15:16 -08:00
The Android Open Source Project
9f78285290 am e113e793: Reconcile with ics-mr1-release
* commit 'e113e793b32ca4c7fe41de41c40a34c494b4c783':
2012-02-16 10:13:52 -08:00
The Android Open Source Project
e113e793b3 Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
2012-02-16 10:10:14 -08:00
The Android Open Source Project
54b67e23e9 am 9777fb10: Reconcile with ics-mr1-release
* commit '9777fb106f3705e2a9610c4f9020d7f68941d83c':
2012-02-16 10:04:19 -08:00
The Android Open Source Project
9777fb106f Reconcile with ics-mr1-release
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3
2012-02-16 10:02:16 -08:00
Mike Lockwood
79f5a0416f WifiStateTracker: add support for overriding DCHP max retry count in an overlay
Bug: 5551068

Signed-off-by: Mike Lockwood <lockwood@google.com>

Conflicts:

	packages/SettingsProvider/res/values/defaults.xml

Change-Id: I6a6519316a87bd1af39ea9dc51e0d312011135ef
2012-02-16 10:01:44 -08:00
Xia Wang
16b7ddcfe6 Remove airplane mode related wifi test for Wi-Fi only devices.
Change-Id: I5b319b98ac68c0b7f053c5baf084c3138db8fe07
2012-02-16 10:00:33 -08:00
Justin Ho
f581e4868b am eefef982: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'eefef98226682a1a6f4458c955b611c69b11068e':
2012-02-16 09:44:03 -08:00
Justin Ho
8ff0c4cb32 am 727ba648: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit '727ba648d66bbeeb003803afcb380cf91bcd9966':
2012-02-16 09:43:57 -08:00
The Android Automerger
2c7933bb96 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 09:40:11 -08:00
Justin Ho
c3132a0b1e am ac18f89c: am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'ac18f89cf5ac8a2a63223c28139f6697d974e533':
  Update WiMAX notification icons Bug: 5724605
2012-02-16 09:31:31 -08:00
Justin Ho
9d7b99976f am 09170888: am cc1bd4bb: am c470b2dd: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit '09170888cbc501cd9819b1caccc99592bc6dd73f':
  Part of fixing issue #6006757: Keyboard dismissal lags
2012-02-16 09:29:53 -08:00
Justin Ho
ac18f89cf5 am e8e0527a: Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1
* commit 'e8e0527aa699c7db999b659b044d16cea6c67901':
  Update WiMAX notification icons Bug: 5724605
2012-02-16 09:29:07 -08:00