64009 Commits

Author SHA1 Message Date
Irfan Sheriff
44b330dfb0 Add multi-interface support to native calls
Add the initial support for supporting seperate socket
connections on the p2p interface.

This is the initial change making primary interface connections
work alongside native support for p2p socket connection

Change-Id: I7619715ca75b10afd29af852279fe713331f75e0
2011-12-28 13:25:14 -08:00
Irfan Sheriff
1f09586953 clean up jni code
- Move all supplicant commands out of jni code in preparation for multi-socket
changes

- Also, clean up some function names to remove the explicit command

Change-Id: Id609ac7df0792fb85b52554d159f22064227c584
2011-12-28 13:18:07 -08:00
Chia-chi Yeh
c1bac3a6e2 VPN: fix a CloseGuard warning.
Change-Id: Ic237a33038be9a170c1f9128332a8743c57971ed
2011-12-27 13:14:51 -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
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
dcd30c8f69 Merge "Use shared connections over retries." 2011-12-22 14:43:28 -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
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
Jonathan Dixon
a46c16c3b6 Merge "Fix silly comment order error" 2011-12-22 06:30:50 -08: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
cbc46d145a Merge "p2p fixes" 2011-12-21 09:26:36 -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
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
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
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
The Android Open Source Project
e4f0034226 am 21cb1290: Reconcile with ics-mr1-release
* commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':
2011-12-20 13:11:53 -08:00
The Android Open Source Project
21cb1290b5 Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
2011-12-20 13:08:33 -08:00
Chet Haase
7d4045b3f2 Merge "Make behavior of ABSOLUTE pivot values more intuitive" 2011-12-20 10:49:02 -08:00
Gilles Debunne
cd76a4da3e Merge "Rationalize blinking cursor test." 2011-12-20 10:46:42 -08:00
John Wang
d02c5dfd8d am c0139281: am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'c01392816fbb16ca76c738bc801f3b2c34548c06':
  Hide emergency call text if not support it.
2011-12-20 10:45:32 -08:00
John Wang
c01392816f am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'c892e177c4f7a41e910c70f68d4e213589da1396':
  Hide emergency call text if not support it.
2011-12-20 10:43:13 -08:00
John Wang
c892e177c4 Merge "Hide emergency call text if not support it." into ics-mr1 2011-12-20 10:41:08 -08:00
Chet Haase
84c949f3b1 Make behavior of ABSOLUTE pivot values more intuitive
Currently, you must call initialize() on RotateAnimation or
ScaleAnimation prior to calling start(). The reason is that the
actual pivot point used in calculating the transform is not set
until that method is called. This makes sense in the typical case
where the animation is running on a View and is using values relative
to the size of the View or of its parent. But if the caller sets the
values to be ABSOLUTE types instead, the sizes of the view and the parent
are irrelevant and the call to initialize() should not be needed (and
is not intuitive).

This fix automatically sets the internal pivot values in the case where
the value types are ABSOLUTE.

Change-Id: I74a0e462486efae08aa76e72c0d19d82f2a2677e
2011-12-20 10:38:31 -08:00
Chet Haase
cf701add24 Merge "Fix ViewAnimator.getDisplayedChild() bug" 2011-12-20 10:37:14 -08:00
Chet Haase
fdeeba9608 Merge "Minor small fixes to old Animation code and docs." 2011-12-20 10:36:55 -08:00
Glenn Kasten
bdb0cee0ef Merge "Remove dead code" 2011-12-20 10:29:49 -08:00
Tom Taylor
e593ea103e Merge "Received MMS is not displayed properly with 'Avea' SIM Card" 2011-12-20 10:15:26 -08:00
Chet Haase
baea244a9f Fix ViewAnimator.getDisplayedChild() bug
Adding a view above the currently displayed child in a ViewAnimator
will cause the displayed child index to become stale, because it is
not incremented to reflect the new position of the currently displayed
view. This fix adds logic to the addView() override to increment the
index correctly.

Change-Id: I9c756ce51a8e8dcbeef8f0e4fbb3704482c21e9d
2011-12-20 08:59:12 -08:00
Jonathan Dixon
9cfff10bf5 Merge "Remove misleading API council comments" 2011-12-20 08:17:43 -08:00
Chet Haase
2d46fcc669 Minor small fixes to old Animation code and docs.
Change-Id: Ib8a1ba2d12e26cc42a2cec48312a5229bb6d4e8a
2011-12-20 07:57:23 -08:00
Chet Haase
f3bd2f7a3f Merge "Fix AnimationDrawable double-start bug" 2011-12-19 18:02:23 -08:00
Bill Gruber
8af76c99d8 am c296892a: am 1d56f41c: Doc Fix: Sensors and Cameras
* commit 'c296892aa2dee5f9e0fee376a2b97a4fa06f3f88':
  Doc Fix: Sensors and Cameras
2011-12-19 17:47:21 -08:00
Bill Gruber
c296892aa2 am 1d56f41c: Doc Fix: Sensors and Cameras
* commit '1d56f41c9d1dcccf1faef343047375cb14799678':
  Doc Fix: Sensors and Cameras
2011-12-19 17:45:24 -08:00
Bill Gruber
1d56f41c9d Doc Fix: Sensors and Cameras
Change-Id: I964a06e5224e59f3098f4d316db4d3b119a05a88
2011-12-19 17:32:47 -08:00
Eric Laurent
0ca16d6ba6 Merge "audio effects: rename configure command" 2011-12-19 17:26:24 -08:00
Eric Laurent
4abf88244b audio effects: rename configure command
Renamed audio effect library interface command for audio format
configuration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG.
This makes the naming more consistent with other exixsting commands
and allow adding a new command to get the configuration (EFFECT_CMD_GET_CONFIG).
Same change for reverse channel configuration renamed from
EFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE.

Implemented EFFECT_CMD_GET_CONFIG in exisitng effect libraries.

Change-Id: Ia7b1c620f13797fe5aceb3b0b4acbacce09fb067
2011-12-19 17:08:31 -08:00
Nick Pelly
5f45cbac03 Fix build break - move API change from 15.txt to 16.txt
Change-Id: I3e7e2106424e00d696909c811ffe704ca8bffced
2011-12-19 16:51:45 -08:00
Irfan Sheriff
bfed2d6c61 p2p fixes
- Change default GO intent to 7
- Handle P2P invitation scenario
- Fix p2p STA connect notification handling to figure device address. Proper fix
for handling both STA connection and disconnection is after we update supplicant

Change-Id: I9ff82f84ad3913905952d1119b7224dff41c24d9
2011-12-19 16:25:53 -08:00
Glenn Kasten
31ba2e5541 Remove dead code
Change-Id: Icf23f7f90fdeb660f4015f22cf239e6d05f5d03c
2011-12-19 15:55:47 -08:00
Nick Pelly
eca6d909f7 Merge "Rewrite NDEF parsing in Java, clean-up API." 2011-12-19 15:53:10 -08:00
Chet Haase
f7917e656b Fix AnimationDrawable double-start bug
AnimationDrawable.setVisible(true, true) was not correctly recording
the fact that it had started the animation, so it was possible to call
start(0 immediately afterwards and have two animations running on the
drawable in parallel, resulting in incorrect frame ordering.

Issue #5782773

Change-Id: Ifc328f755a51d10ab76b84006d1999df03d2dca1
2011-12-19 15:49:42 -08:00