65086 Commits

Author SHA1 Message Date
Jesse Wilson
ea0d0d6d2a am 2ae509b5: Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2"
* commit '2ae509b58a88df9c57cff9a67eefc661a856a04e':
  Move the frameworks/base hostname verifier into libcore. Part 2/2
2011-12-27 16:43:58 -08:00
Jesse Wilson
2ae509b58a Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2" 2011-12-27 16:42:24 -08:00
Jesse Wilson
52cd299eef Move the frameworks/base hostname verifier into libcore. Part 2/2
Bug: http://b/5619726
Change-Id: I165eb3befcef104ff56ffb466c87c60b632f3194
2011-12-27 19:00:56 -05:00
Scott Main
0582da680e docs: add links for Galaxy Nexus driver
Change-Id: Iae875f70049f3b4561783e66e264eac802e8ae19
2011-12-27 15:52:11 -08:00
Chia-chi Yeh
39c7d45c9f am c1bac3a6: VPN: fix a CloseGuard warning.
* commit 'c1bac3a6e240c1c9a14a7b515f585977fb908930':
  VPN: fix a CloseGuard warning.
2011-12-27 13:45:40 -08:00
Chia-chi Yeh
c1bac3a6e2 VPN: fix a CloseGuard warning.
Change-Id: Ic237a33038be9a170c1f9128332a8743c57971ed
2011-12-27 13:14:51 -08:00
Alex Sakhartchouk
a041adcb85 Merge "Missing getter and additional tests." into graphics-dev 2011-12-27 09:04:40 -08:00
Alex Sakhartchouk
60deb2d9ba Merge "Adding tests for element/mesh getters. Fixing bugs found by tests." into graphics-dev 2011-12-27 09:03:38 -08:00
Jesse Wilson
79074cd935 Explicitly specify 'milliseconds' as alarm manager's time unit.
Change-Id: Ic247c1a17283f7b1aa51cae8a2b43e987208aa8a
2011-12-22 22:51:37 -05:00
Eric Laurent
72dafb20e0 audioflinger: fix clicks on 48kHz audio.
The calculation done in prepareTracks_l() for the minimum amount
off frames needed to mix one output buffer had 2 issues:
- the additional sample needed for interpolation was not included
- the fact that the resampler does not acknowledge the frames consumed
immediately after each mixing round but only once all frames requested have been used
was not taken into account.
Thus the number of frames available in track buffer could be considered sufficient although
it was not and the resampler would abort producing a short silence perceived as a click.

Issue 5727099.

Change-Id: I7419847a7474c7d9f9170bedd0a636132262142c
2011-12-22 16:08:41 -08:00
Joe Fernandez
fc8d7a960a am 2b072677: am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '2b072677538de979961b5bf527109fdab1713731':
  docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 16:01:48 -08:00
Joe Fernandez
2b07267753 am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '201469f54522436be79d4d6665721049bfc74320':
  docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:59:34 -08:00
Joe Fernandez
201469f545 am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit 'bb7f590a5a539486de5127071c7ade8ec988d755':
  docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:57:09 -08:00
Eric Laurent
8072715a46 am 2bd0d74a: Merge "AudioService: simplified handler messages."
* commit '2bd0d74a5885f72435da228a00495bae72c07f6f':
  AudioService: simplified handler messages.
2011-12-22 15:56:32 -08:00
Joe Fernandez
bb7f590a5a Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 2011-12-22 15:55:00 -08:00
Eric Laurent
2bd0d74a58 Merge "AudioService: simplified handler messages." 2011-12-22 15:54:38 -08:00
Joe Fernandez
3aef8e1d1b docs: Add developer guide cross-references, Project ACRE, round 4
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
2011-12-22 15:08:23 -08:00
Robert Greenwalt
8f47232dc9 am dcd30c8f: Merge "Use shared connections over retries."
* commit 'dcd30c8f69711ddf9497a80750fff7bc850da63e':
  Use shared connections over retries.
2011-12-22 14:44:47 -08:00
Robert Greenwalt
dcd30c8f69 Merge "Use shared connections over retries." 2011-12-22 14:43:28 -08:00
Roman Nurik
d056087118 am aaad01c7: am 38daf3f1: am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit 'aaad01c7b385a8e663b13462f77e679db7771fdd':
  docs: Update App Widgets dev guide size discussion
2011-12-22 14:34:08 -08:00
Roman Nurik
aaad01c7b3 am 38daf3f1: am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '38daf3f122ac48b20d48779322ffc1a0fb9a3eb9':
  docs: Update App Widgets dev guide size discussion
2011-12-22 14:31:33 -08:00
Alex Sakhartchouk
fd79e02e0f Missing getter and additional tests.
Change-Id: I057dd0a29d2cad40d0a0627b4355faeb82bbc229
2011-12-22 14:30:55 -08:00
Roman Nurik
38daf3f122 am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '38ee0dae2cf0ff1860973523e5cda6e38642e904':
  docs: Update App Widgets dev guide size discussion
2011-12-22 14:29:25 -08:00
Roman Nurik
38ee0dae2c Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1 2011-12-22 14:27:55 -08:00
Roman Nurik
2b43f3f444 docs: Update App Widgets dev guide size discussion
This is mainly an update to match the design guidelines.
See also bug 5555264.

Change-Id: I1c83fb33b7dca412905d21b588c5754d1d3c5cfe
2011-12-22 14:15:07 -08:00
Alex Sakhartchouk
3aac0abe79 Adding tests for element/mesh getters.
Fixing bugs found by tests.

Change-Id: I6592a3b65f16b21255e7788fe8ee8aaafe268638
2011-12-22 13:11:48 -08:00
Danielle Millett
2364a222fc Fix 5783857: Device Policy Manager doesn't allow Face Unlock
This makes it so that if face unlock is enabled and then a device policy
manager that requires something more secure than face unlock is installed,
the user will be forced to choose a new acceptable lock type.

This was previously fixed for the case where the device had been reset, or
the shell was restarted after setting face unlock, but not for the case where the
device remained on between setting face unlock and setting up a device policy
manager.

Also changed the function ordering of saveLockPattern() so that the overloaded
wrapper function is next to the main function.

Change-Id: Ibed8c4ab137ebbc07fb143faef6f047bc6dc4474
2011-12-22 10:00:44 -05:00
Jonathan Dixon
e6a91bc781 am a46c16c3: Merge "Fix silly comment order error"
* commit 'a46c16c3b618e81621ab3b9cc3b567a46662974e':
  Fix silly comment order error
2011-12-22 06:32:53 -08:00
Jonathan Dixon
a46c16c3b6 Merge "Fix silly comment order error" 2011-12-22 06:30:50 -08:00
Brian Colonna
de4eb8e968 Added padding to PIN layout status and carrier text
When using a PIN backup method, Face Unlock was touching the bottom of
the status text on the top and the top of the carrier text on the
bottom, which made it look crowded and bad.

4 dips of padding was added to the bottom of the status text and
another 4 dips was added to the top of the carrier text.  This
corresponds to 8 pixels on the prime and 6 pixels on the crespo.  The
effect of this is that the keypad is 6 pixles closer to the entry text
on the crespo and 8 pixels closer to the entry text on the prime.  On
crespo, the keypad and entry text views are now as close as possible
when examining the pixel locations, but visually there is still space
between them and the difference is hardly noticable to the eye.

Despite the small change, Face Unlock looks a lot better when it is
not literally touching the text.

Change-Id: I01a7a6ace4789232595c5aa7683c1342ebbb2ee2
2011-12-21 13:59:31 -05:00
Jonathan Dixon
02630bfe40 Fix silly comment order error
Incorrectly resolved rebase of my previous two commits...

Change-Id: Ie778774deb7ee0979568ca0a8963db2d72bc7a1a
2011-12-21 18:47:57 +00:00
Irfan Sheriff
395770e5e9 am cbc46d14: Merge "p2p fixes"
* commit 'cbc46d145a799121424f677b62a0d438feb4f911':
  p2p fixes
2011-12-21 09:28:21 -08:00
Irfan Sheriff
cbc46d145a Merge "p2p fixes" 2011-12-21 09:26:36 -08:00
Chet Haase
6d9868c29b am 0f933c9a: Merge "Fix behavior of AnimationSet and fillBefore"
* commit '0f933c9a32dfdc10dbb14fa11c7815541efe22bb':
  Fix behavior of AnimationSet and fillBefore
2011-12-21 07:55:30 -08:00
Chet Haase
0f933c9a32 Merge "Fix behavior of AnimationSet and fillBefore" 2011-12-21 07:53:14 -08:00
The Android Open Source Project
5aa16e9f24 am dfed08bc: am 7e4aa24c: Reconcile with ics-mr1-release
* commit 'dfed08bcfd3ff738cb3a14b261eff2f1b50d4e04':
2011-12-21 07:25:45 -08:00
The Android Open Source Project
dfed08bcfd am 7e4aa24c: Reconcile with ics-mr1-release
* commit '7e4aa24c8701381f542a324df958907194285fdc':
2011-12-21 07:21:45 -08:00
The Android Open Source Project
7e4aa24c87 Reconcile with ics-mr1-release
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
2011-12-21 07:19:20 -08:00
Jonathan Dixon
19644b613e Make WebView.HitTestResult static
- we can do this, because HitTestResult never had a published constructor
  so the only code that can create it has always lived in this package.
- doing this makes the class design cleaner, and smooths the way for allowing
  the new WebView implementation to deal in these results in contexts where
  the appropriate WebView instance is not readily available.

Change-Id: I9e1f1c0faeb16436b1861aab3c2871a5851dfb54
2011-12-21 14:21:36 +00:00
Jonathan Dixon
5c571b4e5f am e230e54f: Minor WebView docs improvement
* commit 'e230e54f09116056e34c7fedd50838ad551c24df':
  Minor WebView docs improvement
2011-12-21 06:06:35 -08:00
Jonathan Dixon
e230e54f09 Minor WebView docs improvement
Change-Id: Ib0389be456755fac24ad130edd0dd091d9acfaae
2011-12-21 13:05:27 +00:00
Eric Laurent
afbb047c39 AudioService: simplified handler messages.
For historical reasons, messages to the AudioSystem
handler in AudioService have a complex identifier combining several information.
Messages for a particular stream contain the stream type as part of the message type.
This complexity is not needed as the stream messages also carry a reference to the
VolumeStreamState object which contains all necessary information, including the stream type.

Also grouped parameters of MSG_PERSIST_VOLUME message into a single bit field to make room for
further needs.

Change-Id: Ia27af626b3447541e8f9eaceba21389a824d88e2
2011-12-20 18:07:41 -08:00
Robert Greenwalt
2cc19b1cc9 Use shared connections over retries.
Old code would detect we were in a retry loop and ignore other active
connections we could share.  We really want live shared connections to
dominate over retrying disconnected ones.

bug:5525764
Change-Id: If93383c52024113eec595b31e46897d1fcabc44c
2011-12-20 17:28:58 -08:00
The Android Automerger
d7d7ff9660 merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:27:07 -08:00
Kazuhiro Ondo
6de972a5c3 Support suggestedRetryTime in CDMA DCT
Support suggestedRetryTime in SETUP_DATA response in CDMA DCT.

Bug: 5740832
Change-Id: I4abd884bec76f1d9ee29d1ba36c7ea2cac9e0fb3
2011-12-20 17:04:52 -08:00
Glenn Kasten
68deb15a2b Remove the notion of "active track" from mixer
This is a first step towards making the mixer more object-oriented.

Change-Id: Ifd445d0e471023a7f5c82e934736ffc95ba1b05b
2011-12-20 16:29:21 -08:00
Chet Haase
0041861a04 Fix behavior of AnimationSet and fillBefore
The previous logic in AnimationSet when starting an animation
ignored the fillBefore behavior of its child animations. This caused
a bug where a delayed AlphaAnimation would automatically cause the
target view to become transparent, even though it was supposed to wait
until after some delay to do so.
The fix checks the fillBefore behavior of each child animation before
concatenating its transform with the transform of the AnimationSet.

Change-Id: I76a2dafbe6dd338dc5281b17612eae87af168d86
2011-12-20 15:56:15 -08:00
Alex Sakhartchouk
a6db9389bd Merge "Adding simple hal struct to type. Fixing off by 1 error in the element." into graphics-dev 2011-12-20 15:00:14 -08:00
Robert Greenwalt
4f74d552d5 Filter our v6 address from tethering dns.
Don't support IPv6 yet, and the tools crash when they see one, so
filter them out.

bug:5763980
Change-Id: Ie9a4445a3c72df3f7ab4320c507ebc8e8cd440ff
2011-12-20 14:47:22 -08:00
The Android Open Source Project
72cfb9aa7d am e4f00342: am 21cb1290: Reconcile with ics-mr1-release
* commit 'e4f0034226731724b67201d69fb4034ef857e2d3':
2011-12-20 13:15:29 -08:00