65763 Commits

Author SHA1 Message Date
Scott Main
7cdf617f43 am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also;
* commit '2a1d19174e32bb6056086ec603948cd476a2ea67':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.
2012-02-15 17:34:14 -08:00
Kent Ryhorchuk
9894eb4e1c Merge "New clock sync control loop." into ics-aah 2012-02-15 17:33:00 -08:00
Scott Main
2a1d19174e Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1 2012-02-15 17:31:54 -08:00
Scott Main
811aca5513 docs: move USB installation info into the OEM USB Drivers document because
the Google USB Driver is deprecated, so consolidating the USB info makes more sense
for the common case of needing an OEM driver
A few changes to the device setup doc also; such as removing the "unknown sources"
step, because that doesn't apply to adb installs.

Change-Id: Ice78c997cbb147865ead78fb037d0b6b64db75bd
2012-02-15 16:46:10 -08:00
Christopher Tate
c5e750b983 Merge "DO NOT MERGE - Configuration resource to suppress tablet status bar contents" into ics-aah 2012-02-15 15:44:13 -08:00
Christopher Tate
8fead66159 DO NOT MERGE - Configuration resource to suppress tablet status bar contents
This is a grotesque hack to avoid showing status bar controls.  The real
solution will be coming via master but not extremely soon; stay tuned but
this gives the right presentation for now without affecting normal products.

Bug 5824373

Change-Id: Ib5348024853ad2e7715b824aba522d80b6a99048
2012-02-15 15:38:43 -08:00
Justin Ho
aefa9219c1 Update WiMAX notification icons
Bug: 5724605

Change-Id: I03f9c2e7c9e94f1d3dc38d9eee3c90c45c0422a6
2012-02-15 14:59:53 -08:00
Scott Main
7717bcbe6e am 26703326: docs: Google+ badge now sizes properly; remove reposition hack
* commit '26703326784a6de45830236bd0a97345f93448d4':
  docs: Google+ badge now sizes properly; remove reposition hack
2012-02-15 13:26:33 -08:00
Scott Main
2670332678 docs: Google+ badge now sizes properly; remove reposition hack
Change-Id: If5e402b8acb249e0ea81436f3d5ecf468934b81f
2012-02-15 13:22:30 -08:00
Kent Ryhorchuk
17fe247616 New clock sync control loop.
Change clock sync control to velicity form PI loop. Tuned for office LAN and
WiFi conditions, will probably perform better in clean environments.
Improve packet filtering to prevent clock sync on bad rtt.
Changed diag interface to take rtt times, P, I, D are no longer supported.

Change-Id: Id7758262c5f987f07d7091aba6c0874d7c19f387
2012-02-14 16:41:26 -08:00
Robert Greenwalt
652fdf9b0e am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
* commit 'c8711ca7eb962072ccd6175be3cfa861195ba6cd':
  Stop using shared DUN APN when tethering stops.
2012-02-14 13:40:02 -08:00
Robert Greenwalt
f0d85f4b39 am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1
* commit 'fc19160a6a464eb71e50794fc1aa1e99c4173e31':
  Add a config to set Dun capabilities.
2012-02-14 13:39:59 -08:00
Robert Greenwalt
c8711ca7eb Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 2012-02-14 13:38:15 -08:00
Robert Greenwalt
fc19160a6a Merge "Add a config to set Dun capabilities." into ics-mr1 2012-02-14 13:37:44 -08:00
Justin Ho
f0e157f2b8 am c312ba32: Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1
* commit 'c312ba322b5f204753a2ad8e40062c26114a15d8':
  Update 4G WiMAX assets for notification area as well Bug: 5724605
2012-02-14 13:31:26 -08:00
Justin Ho
c312ba322b Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 2012-02-14 13:29:08 -08:00
Joe Fernandez
e08eaee3a0 am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1
* commit '835e07f8f437e1872451dd23c0faf925388e1aef':
  docs: Android NDK r7b Release Notes
2012-02-14 12:37:53 -08:00
Mike Lockwood
594eba859f am ffc89899: Merge "Don\'t pulse LED on new notification unless notification has LED flag set" into ics-mr1
* commit 'ffc89899652f5c815b6d156f55a909001420891e':
  Don't pulse LED on new notification unless notification has LED flag set
2012-02-14 12:37:51 -08:00
John Wang
78308ca1b4 am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1
* commit '63b596664c3fdb70ad32c8f641f477ec9140d6ec':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.
2012-02-14 12:37:49 -08:00
Justin Ho
9dd3a66286 Update 4G WiMAX assets for notification area as well
Bug: 5724605

Change-Id: Iade031923f1d3a07ca6dd366642c04071168d495
2012-02-14 12:10:54 -08:00
Joe Fernandez
835e07f8f4 Merge "docs: Android NDK r7b Release Notes" into ics-mr1 2012-02-14 12:05:25 -08:00
Joe Fernandez
0ae5cacf6c docs: Android NDK r7b Release Notes
Change-Id: Ib1a92b1bbdb190f3aae6dcc69a78cbf5ad3c4760
2012-02-14 11:49:27 -08:00
Robert Greenwalt
2384386f31 Stop using shared DUN APN when tethering stops.
Backported from master, including a bug fix and a cdma enhancement.

Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using a carrier-
described APN when the tethering stops.

bug:5972599
Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
2012-02-14 11:44:09 -08:00
Mike Lockwood
ffc8989965 Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1 2012-02-14 11:30:05 -08:00
Robert Greenwalt
8d27f20ac2 Add a config to set Dun capabilities.
Since CDMA doesn't use APN settings there was no place to say what a cdma
device's DUN connection would support, so by default normal device
originating traffic would be blocked on a tethering single-connection device.

With this change you can (via overlay) say that it supports everything
so mms and on-device browsing/email will still work even when on a dun connection.

The reason to allow both: some carriers will charge per byte for dun access
and so they don't want lots of non-tethering traffic used (costs the user alot)
but other carriers just use a dun connection to limit access to tethering, but
once there give unlimited data, so it makes sense to support everything there.

bug:5972599
Change-Id: I78fd7f3ac63c51a0560b659ed5ec219b10a93f8d
2012-02-14 11:29:36 -08:00
John Wang
63b596664c Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 2012-02-14 10:09:26 -08:00
Mike Lockwood
ece18efb35 Don't pulse LED on new notification unless notification has LED flag set
Bug: 6006131

Change-Id: I719c7d68e310bfaca227f6286159b3993784926b
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-13 20:42:19 -08:00
John Wang
d55cde1384 Only use CDMA rssi for config_alwaysUseCdmaRssi.
If config_alwaysUseCdmaRssi is true, the RSSI signal bar only
shows the CDMA value, no matter it connects to EVDO or WiMax .

bug:5941743
Change-Id: I4187571898a9fb47162e1ccf0cc4c59c3136ae0b
2012-02-13 17:48:24 -08:00
Mike Lockwood
c4ddf2fd5f Merge "WifiStateTracker: add support for overriding DCHP max retry count in an overlay" into ics-aah 2012-02-13 14:30:45 -08:00
Mike Lockwood
11046a2a4b WifiStateTracker: add support for overriding DCHP max retry count in an overlay
Bug: 5551068

Change-Id: I7817eeb1409af2056a63548104c3c64f93ee7def
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-13 14:08:50 -08:00
John Grossman
6927efc5ad Merge "Put a bandaid on a segfault in timed audio track handling." into ics-aah 2012-02-13 14:07:17 -08:00
Tsu Chiang Chuang
9dfb0c6c65 am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
2012-02-13 13:43:34 -08:00
Tsu Chiang Chuang
08eb7dd630 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
John Grossman
e1288ffbf2 Put a bandaid on a segfault in timed audio track handling.
Add a bandaid to prevent a segfault which can occur while handling
timed audio buffers.  There is a deeper problem which should
eventually be addressed, but for now this fix should prevent any
crashing.

The deeper problem is as follows.

When the AudioFlinger mixer gets data to mix from an AudioTrack, it
ends up getting a structure filled out which points into an IMemory
region owned by the AudioTrack.  Unfortunately, this structure is not
holding a refcount on the IMemory which it points into.  If the
IMemory refcount hits 0 and the chunk of RAM is retuned to the binder
heap it came from, there can still be a Buffer object being held by
the AudioFlinger mixer which points into the region of memory which
was retuned to the binfer heap.  If AF reads from this buffer, it
could read corrupt data (if the region of memory gets handed back out
to a writer), or it could segfault (if the heap has been freed and the
pages unmapped).  Similar problems could happen if AF attempts to
write to the buffer, heap corruption in one case, segfaulting in the
other.

In the past, this has not been an issue for AF, because tracks
allocate a single IMemory (which serves as a ring buffer) and the
IMemory lives for as long as the track lives.  As an artifact of the
way the code came out, the mixer cannot be holding a Buffer structure
pointing into the IMemory which used to be owned by a track if the
track no longer exists.  Tracks cannot come into or out of existence
during a mix operation, which is the only thing which makes this safe.

TimedTracks work differently, however.  Timed tracks each allocate a
small binder heap, and then hand out IMemory instances  broken out of
this heap.  The heap lives as long as the track, so the worst which
could happen here is that a TimedTrack's IMemory gets returned to the
heap while there is still a buffer structure in flight pointing into
the memory region, then the region gets handed out again and
overwritten by new data causing the mixer to mix the wrong audio.  The
timing to cause this to happen is very difficult to encounter, and you
to generate the timing conditions required, you need to be in a pretty
bad failure state where audio is already breaking up and skipping, so
its unlikely that anyone would notice (which is why I'm band-aiding
the segfault and letting the deeper issue slide for now).

In general, however, it might be a good idea to revisit this buffering
design.  On principal, if someone is going to hold pointers into a
refcounted object, they should be holding a ref on the object at the
same time.  Failure to do this will usually lead to a situation where
there are corruption or segfault issues, or to a system where the
refcounted object's lifetime must be implicitly managed very carefully
in ways which are usually non-obvious and are easy to break by new
engineers on a project.

Change-Id: Ib391075395ed0ef46a03c37aa38a82d09e88abeb
2012-02-12 17:51:21 -08:00
Wink Saville
673b352f6b 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:06 -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
Eric Fischer
4e2a6ae15f am 650462bb: Import revised translations. DO NOT MERGE
* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE
2012-02-10 13:11:03 -08:00
Eric Fischer
650462bbfd Import revised translations. DO NOT MERGE
Change-Id: Ibfc588d17f79baa0359d3a20a0a5ff7a2f3f152b
2012-02-10 12:29:26 -08:00
Kazuhiro Ondo
afd8f1820e Add OEM specific USB mode enumeration based on ro.bootmode property
This patch is adding a capability so that OEM can override USB mode
in case the device is boot up with OEM specific mode. (i.e. modem
debug, factory test etc.)

Bug:5964042
Change-Id: Ic8e23d302563ce71eedb74ce94cca8c65838a4f7
2012-02-10 12:29:12 -08:00
Justin Ho
7f3b28f58c am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
  Import translations. DO NOT MERGE
2012-02-10 10:09:58 -08:00
Justin Ho
744c5b0bde Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -08:00
Scott Main
999b646bd3 am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
2012-02-09 16:01:25 -08:00
Scott Main
d9c8bbd56a docs: fix xss issue
bug 5125642

Change-Id: I326b619643e3b3de20aa9303e92c9218fdfe50f7
2012-02-09 15:57:09 -08:00
Joe Fernandez
da13251fac am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
2012-02-09 13:46:57 -08:00
Joe Fernandez
1c66faab73 Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 2012-02-09 13:45:01 -08:00
Scott Main
dfa926f54b am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
2012-02-09 12:48:18 -08:00
Scott Main
52bfc24368 docs: fix misc doc bugs from external issue tracker
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
2012-02-09 12:45:16 -08:00
John Grossman
b859d83bc9 Merge "Fix a segfault in AudioFlinger." into ics-aah 2012-02-09 11:51:51 -08:00
John Grossman
2cb8784d03 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: I45f0fd3de003151f98acf32c36c42f58d053f3a0
2012-02-09 11:31:06 -08:00
Mike Lockwood
0e8392e1dc Add support for non-linear ramping of master volume adjustment
Bug: 5472584

Change-Id: Id75f8835f6693ae3fcb7ca451ada01f22faba1aa
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-09 11:24:10 -08:00