63484 Commits

Author SHA1 Message Date
The Android Automerger
36d9a11ac1 merge in ics-mr0-release history after reset to ics-mr0 2011-10-28 09:53:33 -07:00
Scott Main
43eed0039c am b44038fd: docs: platform note typo
* commit 'b44038fd294382d42070eb60df3bf5132eb4cb29':
  docs: platform note typo
2011-10-28 16:39:46 +00:00
Scott Main
b44038fd29 docs: platform note typo
Change-Id: I257427257573a881acdf7e55804ed5481142ce01
2011-10-28 09:37:19 -07:00
Andreas Huber
27ed12492d Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 2011-10-28 09:13:54 -07:00
Mike Lockwood
5020e7e2d3 VolumePanel: Add support for master volume
Change-Id: I3119eb2b7d3b5e7ce87f1660b50c10ab79c7bbdf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 11:44:23 -04:00
Mike Lockwood
87abcad911 Merge "VolumePanel: Add support for master volume" into ics-aah 2011-10-28 08:39:15 -07:00
Jason Simmons
e55b072c93 Do not inline the audio resampler assembly functions
The assembly expects arguments to live at fixed offsets from the stack pointer
which are invalid if the code is inlined.

Change-Id: Ie93e93c5c69774079112345754fbc85896fc2f64
2011-10-28 10:30:15 -04:00
Mike Lockwood
619f06444b Save and restore master volume in the settings provider
Change-Id: I135c48155c41735c870e3934469c47f05bd74973
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:53 -04:00
Mike Lockwood
dff25597a9 Simple master volume support
Still needs integration with Settings (for persistence) and VolumePanel UI.

Change-Id: I9eca92c4b1ef2df2564411006a35753ab9618dce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:53 -04:00
Mike Lockwood
a56041ea3d config.xml: Add config_useMasterVolume
Change-Id: I5989d8cfc15248e748ebef484b3409a76e409c79
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:53 -04:00
Mike Lockwood
0897602a61 SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
Change-Id: I93c523b0e9b59f1fe72595ca6f3ae22e57c4939f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
3440013d65 Load lockscreen.disabled setting on database create as well as upgrade
Change-Id: I987cee2734b92458e799d9bac97b5a877a64d4f6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
38175a8c4f SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
Change-Id: I64b502799fae7ccf8ea8e52487c33324908c6b60
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
017219ab2a SettingsProvider: Add support for overriding lockscreen.disabled default value
Change-Id: I88c03a01727538dde3cec1ab93ebe8a66a6768a7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
ee2dd90cbb SystemUI: Fix problems with navigation bar on landscape devices
Change-Id: I65217c78f4ffa44021df4dd47e77ec7e1e6937f7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Mike Lockwood
091c4f67b1 Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
Change-Id: Ic9a6da1f52848a2445d64b87e6f23aa4750d2842
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:52 -04:00
Joe Onorato
8f3580e9da Revert "Treat parcelables as flattenables for now, until the sdk contains a newer aidl."
Change-Id: I8f588d160888550ee79564afe6935fd0f78bc1f7
2011-10-28 10:14:52 -04:00
Joe Onorato
47f2f8340f Treat parcelables as flattenables for now, until the sdk contains a newer aidl.
Change-Id: Ic673aaa41fc9f430fdb7bda8963297452c9471da
2011-10-28 10:14:52 -04:00
Girts Folkmanis
a7983bff03 Disable output processing when opening serial port.
If post processing is not disabled, we end up translating LF to CRLF, which
makes binary protocols sad.

Change-Id: I43ddd0c690c0d00f5e9416a2397b43d5153491d3
2011-10-28 10:14:52 -04:00
John Grossman
ee889d8952 AAH: Fix PID gain for HW clock recovery.
Before HW came in, when doing SW clock recovery, gain had been set to
produce a correction expressed in PPM from [-100, 100] PPM.  The HW
local clock HAL has been spec'ed to take a drive range from MIN_INT_16
to MAX_INT_16.  This changes the PID recovery loop to use a range from
MIN_INT_16 to MAX_INT_16, and adjusts the P and I gains to be the same
as they were before, but adjusted for the scale change.

Change-Id: Ia636fd1bc6c5c1117ddfdc5289c51286cb874c23
2011-10-28 10:14:51 -04:00
John Grossman
89e058e36a AAH: Don't panic unless you are sure.
Change the definition of the panic threshold for the time sync service
to take the round trip time of the packet producing the discipline
action into account.  The idea here is that, in the worst case, the
error in the measurement of the clock sync error might be as high as
the round trip time of the packet used to measure the error.  If a
packet says we are 50mSec fast, its RTT is 75mSec, then we could be
anywhere from 25mSec slow to 125mSec fast.

This change basically makes it so that the error measurement must be
greater than the RTT + the fixed panic threshold before we panic.  IOW
we don't panic unless we absolutely sure that our error must be
greater than the fixed panic threshold.  Also, lower the current value
of the panic threshold from 50mSec down to 20.  Now that the
definition takes into account the RTT, we can afford to be much
tighter in our definition of the fixed panic threshold.

Change-Id: Id801f6b59545ee52d59944dfa3d545d108f88b0e
2011-10-28 10:14:51 -04:00
John Grossman
9684be35bf AAH: Fix a bug in the master election state machine.
Client's of Masters who disappear before the client has processed even
one timesync response should not enter the Ronin state.  Since they
have never synced to the old Master's timeline, by becoming Ronin they
run the risk of defeating other new Ronin's in the master election,
even though they don't have any idea what time it is on the old
Master's timeline and therefore are unsuitable to serve as the new
Master.  Instead, they should transition to the Initial state, where
other new Ronins (who do know what time it is) have the chance to step
in and serve as master of the old timeline.  If there are no other
Ronin who can do the job, then the old timeline is dead and by
transitioning to Initial, a new one will be generated.

Change-Id: Iaa95313bfe68a971be2764e252ebf4b34313013d
Signed-off-by: John Grossman <johngro@google.com>
2011-10-28 10:14:51 -04:00
Joe Onorato
adfe8d28bf Update aidl for new Broker API.
Change-Id: Ibb92fb85eea5e9c9aeaf8ef1d2a5ef19fbf68021
2011-10-28 10:14:51 -04:00
Joe Onorato
94ca1b9978 aidl: All flattenable types now must also be parcelable.
This is more a limitation of the grammar than anything else triggering laziness on my part.

Change-Id: I5ad949c6d8378870e40a15cf6e975e318cfeece5
2011-10-28 10:14:51 -04:00
Joe Onorato
abd8c07091 Update aidl to new APIs.
Change-Id: If7a39bec6478ee2a2c1493c744fa5afe9757c88d
2011-10-28 10:14:51 -04:00
Joe Onorato
11987cdbb3 Suport RpcData as a parcelable type.
Change-Id: I5721fe5b33f52edfb06f4c9cd4f8c97d234e9fc7
2011-10-28 10:14:51 -04:00
Manuel Roman
9e2df97488 Modified AIDL to support authentication
We need to pass an RpcContext with information
such as the caller's certificate. I also modified
the compiler so it does not use Container anymore
and uses Context

Change-Id: Ib54b774f9c7b5cb3e0a014ce91548b817efcb72b
2011-10-28 10:14:51 -04:00
Mike J. Chen
8f1667ac78 Fix disconnect from wired ethernet issues.
When a cable was unplugged, we were telling the driver to release the
ip address so if a cable on a different network was plugged in, it would
still try to use it's old ip address on the new network, which probably
didn't work.

Also, we didn't notify ConnectivityService about the state change in
the unplug case.  Some of this was done in the interface removed case,
but we never remove the interface in Tungsten, just unplug.  So refactor
the common disconnect code into a disconnect() function that's called
by both the link status change (unplug) and interface removal (only applies
to things like USB ethernet dongles) cases.

Change-Id: I19d7ceb540d6a0e24df1b55314a13af78f1e593d
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-10-28 10:14:51 -04:00
Tim Kilbourn
923a41816c Fix PresenterClass by adding a _listener field
Change-Id: I22578bba4d66d032f67ceec3e7232de13be4f175
2011-10-28 10:14:51 -04:00
Joe Onorato
827af24a3e add presenters to aidl.
Change-Id: I23c0bb085f3bfd27ca3b7f53e26cb704f8ddac1a
2011-10-28 10:14:50 -04:00
Mike Lockwood
05353f61b4 Add SerialPort.sendBreak()
Change-Id: Ibc0ac50a5358761cce699f189a142e91e79cf835
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:50 -04:00
Mike Lockwood
44b471231c PhoneWindowManager: Disable boot progress dialog on headless builds
Change-Id: I1ac3475bade29a460ebb48a4962edd72daeb6637
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:50 -04:00
Joe Onorato
acff08262d Support custom flattenable types for RPC.
Change-Id: I5c29043baba792ce99d2e9d48bc96d4837b2a808
2011-10-28 10:14:50 -04:00
Joe Onorato
de81fcb590 Generate fallthrough for unhandled actions in RPC methods.
Change-Id: I08031c5a89f467691fc02cb4d44e49be3e48ed58
2011-10-28 10:14:50 -04:00
Mike Lockwood
fc5b4f757f SystemServer: Don't start A2DP service if audio is not enabled
Change-Id: I95b8971cf79a99d8a98b48fd1337cc5cb4767e29
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:50 -04:00
Jason Simmons
14d21d9bd9 Configure the A@H TX media player with one string
Music2 would prefer a configuration interface that takes a single
blob of data passed in from the RPC client and then passes it
opaquely to the media player.  This eliminates the need for Music2
to rev their application if we add more configuration options to
the TX player.

Change-Id: Ia2daea3ff2502f91f8a5a82b898752c435279a0f
2011-10-28 10:14:50 -04:00
Jason Simmons
e066b8fce4 Ensure that the TRTP retry buffer has contiguous sequence numbers
Previously, sequence numbers for audio packets were assigned by the
TX player before packets were queued to the sender.  This caused a
race between assignment of sequence numbers on audio packets and
sequence numbers on heartbeat packets.  A heartbeat could get queued
and added to the retry buffer before an audio packet with an earlier
sequence number got queued.

This CL centralizes packet sequence number assignment and insertion
into the retry buffer inside AAH_TXSender::doSendPacket_l.  It also
makes explicit what operations can be done on a TRTPPacket before
and after packing.

Change-Id: I6d02eae81061983e4def4f1b3dd7c1625467b151
2011-10-28 10:14:50 -04:00
Mike Lockwood
d070dca89f Fix problems dispatching media button events on headless devices
Change-Id: I57444f2b0b51b08fda561d5acecb66316fb3f4a7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:50 -04:00
Jason Simmons
1ce5eb6147 Hold the AAHDecoderPump ThreadWrapper in a ref-counting pointer
Change-Id: Iff840dbd9e1f79a07e62c1481b2b0797f30247cb
2011-10-28 10:14:49 -04:00
Joe Onorato
ef6ab2dceb Add RpcData as a built-in marshallable type.
Change-Id: I12e74da51c5972a4c5eb73656dcf6f3bb0104443
2011-10-28 10:14:49 -04:00
Joe Onorato
1f44bba3b6 Add the full suite of RpcData types.
Change-Id: I0ce17d46b21cbfe04ff7bd77dd71be70dc7f80ac
2011-10-28 10:14:49 -04:00
Joe Onorato
ae7f32e97d Checkpoint adding @home RPC support to aidl
Change-Id: I908950ec4892438b1d253475833e153b5a566fdc
2011-10-28 10:14:49 -04:00
Mike Lockwood
bc06928ef3 ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
Change-Id: Ibf4ea989ef031a93d96ee0a0f7b24284edf2517c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:49 -04:00
Mike J. Chen
c15a71e59a MediaPlayer changes for Tungsten/Android@Home.
Squashed merge from master-tungsten of the following changes:

commit e8b156c6b224f0fe5b6a81d5f92bade36275027c
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 10:28:48 2011 -0700

    Add a null check to handle failure of android::createPlayer

    Change-Id: Iacbbc90369a825838d4374b1f774c8880b25753b

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

commit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:06:49 2011 -0700

    Name changes for the TRTP Players s/tungsten/aah/g

    Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51

commit cbf2903ab6893b6e662514e2f6d670e268a419df
Author: John Grossman <johngro@google.com>
Date:   Fri Apr 15 09:27:54 2011 -0700

    Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.

    Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502

Change-Id: I73f3be191cd974933acddf52892e5600d253cc03
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-10-28 10:14:49 -04:00
Mike J. Chen
06e04e4c17 Add media/libaah_rtp
RTP library used to broadcast media from one device to a collection
of listeners.  Handles failures/retries/etc.

This is a squashed merge from master-tungsten of the following changes:

commit e1a5101fe627d71739a7c4263bb3a65c7bc44385
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 13:24:21 2011 -0700

    Hold ThreadWrapper in a ref-counting pointer

    Change-Id: Iaf3343182e37bcc0ca99fbaf8f9bbb8c4984072a

commit 89b90d62e164ff3db27c9cba85255fc476d2dd96
Author: Jason Simmons <jsimmons@google.com>
Date:   Wed Aug 10 13:08:25 2011 -0700

    Update the Tungsten TX player to use HTTPBase

    Change-Id: I9f7ecf1b4b496cec1815284dbcdb958a43284169

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

Change-Id: I5fe1ea941c09204d7b33f15f4e2b2ab320dc468b
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
2011-10-28 10:14:49 -04:00
Mike Lockwood
2a9c3c9488 Quick and dirty test app for new SerialPort API
Change-Id: Ie1ae6e7387b9f1e2788b798de29a06d551a44d1d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:49 -04:00
Mike Lockwood
e0ded6710a New Serial Manager API:
SerialManager: provides access to serial ports
SerialPort: for reading and writing data to and from serial ports

IO with both array based and direct ByteBuffers is supported.

Accessing serial ports requires android.permission.SERIAL_PORT permission

Each platform must configure list of supported serial ports in the
config_serialPorts resource overlay
(this is needed to prevent apps from accidentally accessing the bluetooth
or other system UARTs).

In addition, the platform uevent.rc file must set the owner to the
/dev/tty* files to "system" so the framework can access the port.

Change-Id: I8d75ca7d6592223ea6c47f8a17fa180dfed1aad0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:49 -04:00
John Grossman
6fd7789abc Make the LocalClock HAL wrapper use a singleton HAL instance.
Change the local clock helper wrapper to hold just a single copy of the local
time HAL instead of having each wrapper hold their own HAL instance.

Change-Id: I978bf70236095251941776be86abb6a27cc4bf5d
2011-10-28 10:14:48 -04:00
John Grossman
10bd439022 Reintroduce a line of code which disappeared during reformatting.
Reintroduce a line of code which went missing during a global reformat for style
reasons.

Change-Id: I9f8f8a88cd9e490197963a1287555afc2906ea62
2011-10-28 10:14:48 -04:00
John Grossman
8659bd107f Add a missing NULL check.
The get_next_write_timestamp method introduced to the audio HAL is optional.
HALs which do not implement it leave it set to NULL.  Callers (there is
currently only one in the AudioMixer code) need to be certain to check for NULL
before invoking it.

Change-Id: I88ba43bb53bec081c98c9a8842936c4fbfdd44f6
2011-10-28 10:14:48 -04:00