24736 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
aac6a74817 Merge "Only monitor recognized uevent devices." into gingerbread 2010-08-18 13:56:58 -07:00
Mathias Agopian
8ad86fef49 Merge "Improve documentation of getAltitude" into gingerbread 2010-08-18 13:55:01 -07:00
Mathias Agopian
26bcc7b442 Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread 2010-08-18 13:54:46 -07:00
Sean McNeil
aeb00c409d Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.

Change-Id: Ib2c93105e7d746d9c1a7414bea8bab3fb8c0b70a
2010-08-18 13:53:36 -07:00
Jeff Brown
72e0b2ab08 Merge "Fix some input device mapping bugs with certain drivers." into gingerbread 2010-08-18 13:38:32 -07:00
Jeff Brown
2dfd7a7cbf Fix some input device mapping bugs with certain drivers.
On single-touch devices, pointer up/down is signalled by a BTN_TOUCH
key event.  Previously we handled BTN_TOUCH immediately but some drivers
may produce the sequence BTN_TOUCH, ABS_X, ABS_Y, SYN_REPORT on pointer down
which caused us to emit a bad initial pointer down location.
Now we wait for SYN_REPORT before reporting the up or down.

On multi-touch devices, pointer up can be signalled by as little as
the sequence SYN_MT_REPORT, SYN_REPORT.  This change ensures that we
handle this case.

Added support for reading ABS_MT_PRESSURE when available.
Corrected mapping of touchMajor/touchMinor on single touch devices.
Minor code cleanup.

Change-Id: Ic7ec4811241ed85a06e59b8a839ca05180d491d4
2010-08-18 13:37:45 -07:00
Mathias Agopian
a6704d39b3 Improve documentation of getAltitude
Change-Id: Ie6c61fa6018e54143cec6e65978df9abb48854d9
2010-08-18 12:00:30 -07:00
Konstantin Lopyrev
f2af87b39b Merge "Making sure the draw time is measured." into gingerbread 2010-08-18 11:43:21 -07:00
Konstantin Lopyrev
bef337f516 Making sure the draw time is measured.
Change-Id: I6bf8094aee03793f125008386c4fea730e95d07a
2010-08-18 11:31:27 -07:00
Jens Gulin
c4554b9a08 Keep track of remaining fd when devices are removed
Sometimes the wrong fd was accessed when the device was addressed
by device id.

The earlier implementation assumed that two arrays were in sync
but one of them was compacted when devices were removed. Instead
of that dependency the device now keeps track of it's file descriptor.

Change-Id: Ib0f320603aafb07ded354bc3687de9759c9068f2
2010-08-18 10:54:03 -07:00
Brian Carlstrom
d313cab46e Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread 2010-08-18 10:21:28 -07:00
Wu-cheng Li
c86960236d Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread 2010-08-18 10:19:45 -07:00
Andreas Huber
af063a67b2 Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
Change-Id: Ibe71f5941485660510e24d714da3865b9c6f89a2
2010-08-18 10:17:18 -07:00
Andreas Huber
4dda6ddb25 Merge "Make the OggExtractor less verbose." into gingerbread 2010-08-18 10:10:14 -07:00
Andreas Huber
0324ce9a1e Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread 2010-08-18 10:07:29 -07:00
Andreas Huber
08c94b265c Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17
2010-08-18 09:58:30 -07:00
Kenny Root
02ca31fbae Add OBB flags to support overlays
* Add flags field in OBB footer to support overlays.

* Remove unused 'crypto' and 'filesystem' fields in obbtool (could
  later be supported in the "flags" field of the OBB footer).

* Add notes to document OBB classes before shipping.

Change-Id: I386b43c32c5edef55210acb5d3322639c08010ba
2010-08-18 09:34:58 -07:00
Steve Howard
baf3869b88 Merge "Fix up handling of null fields in DownloadManager." into gingerbread 2010-08-18 09:03:34 -07:00
Kenny Root
face0c02a0 am 46906276: Amend previous ndc commit
Merge commit '46906276448dd36e7a5cca38fbe9fdb3142f7948' into gingerbread

* commit '46906276448dd36e7a5cca38fbe9fdb3142f7948':
  Amend previous ndc commit
2010-08-18 08:50:59 -07:00
Kenny Root
e2f95e42c2 am a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25' into gingerbread

* commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25':
  Add more error checking for ndc
2010-08-18 08:50:56 -07:00
David 'Digit' Turner
a6b47cd39a am 24a03083: PackageManagerService: always install native binaries from .apk
Merge commit '24a03083ca5cf33342debb9a230a591f098f7fd8' into gingerbread

* commit '24a03083ca5cf33342debb9a230a591f098f7fd8':
  PackageManagerService: always install native binaries from .apk
2010-08-18 08:45:35 -07:00
Kenny Root
b9f1c70a88 Amend previous ndc commit
Submitted wrong patchset. This includes the delta for the latest
patchset.

Change-Id: I63bb9a37dd9100550ae07a3a1c9fdd9fd71724e1
2010-08-18 07:55:09 -07:00
Kenny Root
4690627644 Amend previous ndc commit
Submitted wrong patchset. This includes the delta for the latest
patchset.

Change-Id: I63bb9a37dd9100550ae07a3a1c9fdd9fd71724e1
2010-08-18 07:53:30 -07:00
Brian Carlstrom
232a0331c0 tracking merge of external/apache-http from dalvik-dev
Change-Id: I25d7659b25f86f88cb36b4f80589b8c3e3a8c6b2
2010-08-18 00:47:08 -07:00
Joe Onorato
1fdb1fb43a Add a method to let a properly permissioned app directly
manipulate the user activity timeout.  We should come up
with a better API for this, but this is for a last minute
power manager hack to turn off the screen sooner after a
phone call ends.

Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa
2010-08-18 00:11:04 -07:00
Fred Quintana
5cbaba857a Changed SyncOperation.toKey() to not rely on the implementation of
Account.toString()

bug: 2898033
Change-Id: I6bfac976127190d2d667312df7aa9c7d57b21555
2010-08-17 23:57:33 -07:00
Andreas Huber
4b34662bac Squashed commit of the following:
commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date:   Tue Jul 20 09:21:17 2010 -0700

    Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

    Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
    related-to-bug: 2826841

commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date:   Sun Jul 18 17:57:01 2010 -0700

    Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

    Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8

commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date:   Thu Jul 8 20:56:13 2010 -0700

    Enable the support for decoding audio with AAC+ and eAAC+ features

    bug - 282684

    Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b

Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
2010-08-17 23:53:34 -07:00
Kenny Root
eb2e095469 Add more error checking for ndc
In NativeDaemonConnector.doCommand() calls, there was inconsistent error
checking. This change adds error checking for every call and makes it so
that any call to .doCommand() that gets an error code won't cause the
code to hang forever.

Change-Id: If714282b6642f278fb8137f652af1a012670253b
2010-08-17 23:32:20 -07:00
Kenny Root
a34c9ca30e Add more error checking for ndc
In NativeDaemonConnector.doCommand() calls, there was inconsistent error
checking. This change adds error checking for every call and makes it so
that any call to .doCommand() that gets an error code won't cause the
code to hang forever.

Change-Id: If714282b6642f278fb8137f652af1a012670253b
2010-08-17 23:29:46 -07:00
David 'Digit' Turner
e2fd45af93 PackageManagerService: always install native binaries from .apk
The previous implementation fails to work properly when the .apk
and installed versions of the binaries have the same size and date.

Change-Id: I063817a935da9ad459858d7eec8bb3d940607850
2010-08-17 23:24:52 -07:00
David 'Digit' Turner
24a03083ca PackageManagerService: always install native binaries from .apk
The previous implementation fails to work properly when the .apk
and installed versions of the binaries have the same size and date.

Change-Id: I063817a935da9ad459858d7eec8bb3d940607850
2010-08-17 23:21:56 -07:00
Mathias Agopian
cfa275908a revert hwcomposer HAL changes. DO NOT MERGE.
This reverts commit:
94364b91a2894bf037b8beb027132fbb812e1434
f8e705dea48f77f1c2532fdbadd4997dd1851af0
b59beb5ca68d0228f60dda60d85e2d0226b33215
e0d5f5bcf5a8b26f4ad75f549cbf380b2c9faf20
2010-08-17 20:22:04 -07:00
Hung-ying Tyan
6ab9460875 Merge "CallManager: add setAudioMode()" into gingerbread 2010-08-17 19:52:50 -07:00
Jeff Brown
3922484d74 Merge "Optimize EventHub reads." into gingerbread 2010-08-17 19:41:46 -07:00
Jeff Brown
cc2e717f1d Optimize EventHub reads.
Change-Id: Id7d09c0a6e5c741c1e29becd2b6560772c5ff372
2010-08-17 19:40:26 -07:00
Hung-ying Tyan
a4cb657e3a CallManager: add setAudioMode()
When in a call, different audio modes need to be applied based on phone type.
(For example, SIP call needs to be in MODE_NORMAL while GSM call in MODE_IN_CALL.)
Originally, it's handled in PhoneUtils.setAudioMode(). It makes more sense now
to handle the actual logic in CallManager.

Change-Id: I58d8f31d6b4afe22f88da442daac2010781de801
2010-08-18 10:21:10 +08:00
Svetoslav Ganov
3dfaf21dfc DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
Change-Id: I18437d98032487329b6b9b579ed12abbfb77501f
2010-08-17 19:03:56 -07:00
Hung-ying Tyan
8eac20eacd SIP: implement conference call
Change-Id: Ifd420ed95e77e744c6aff28ac63e7363f97d9dc6
2010-08-18 10:00:36 +08:00
Hung-ying Tyan
f6354aca3a Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread 2010-08-17 17:34:05 -07:00
Eric Fischer
04e5a1cba9 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-17 17:19:21 -07:00
Jeff Brown
72ce42352c Merge "Fix possible race conditions during channel unregistration." into gingerbread 2010-08-17 17:05:38 -07:00
Jeff Brown
2cbecea4c9 Fix possible race conditions during channel unregistration.
Previously, the input dispatcher assumed that the input channel's
receive pipe file descriptor was a sufficiently unique identifier for
looking up input channels in its various tables.  However, it can happen
that an input channel is disposed and then a new input channel is
immediately created that reuses the same file descriptor.  Ordinarily
this is not a problem, however there is a small opportunity for a race
to arise in InputQueue.

When InputQueue receives an input event from the dispatcher, it
generates a finishedToken that encodes the channel's receive pipe fd,
and a sequence number.  The finishedToken is used by the ViewRoot
as a handle for the event so that it can tell the InputQueue when
the event has finished being processed.

Here is the race:

1. InputQueue receives an input event, assigns a new finishedToken.
2. ViewRoot begins processing the input event.
3. During processing, ViewRoot unregisters the InputChannel.
4. A new InputChannel is created and is registered with the Input Queue.
   This InputChannel happens to have the same receive pipe fd as
   the one previously registered.
5. ViewRoot tells the InputQueue that it has finished processing the
   input event, passing along the original finishedToken.
6. InputQueue throws an exception because the finishedToken's receive
   pipe fd is registered but the sequence number is incorrect so it
   assumes that the client has called finish spuriously.

The fix is to include a unique connection id within the finishedToken so
that the InputQueue can accurately confirm that the token belongs to
the currently registered InputChannel rather than to an old one that
happened to have the same receive pipe fd.  When it notices this, it
ignores the spurious finish.

I've also made a couple of other small changes to avoid similar races
elsewhere.

This patch set also includes a fix to synthesize a finished signal
when the input channel is unregistered on the client side to
help keep the server and client in sync.

Bug: 2834068
Change-Id: I1de34a36249ab74c359c2c67a57e333543400f7b
2010-08-17 17:03:42 -07:00
Irfan Sheriff
a1af0d7c80 Merge "Fix SDK build" into gingerbread 2010-08-17 16:48:36 -07:00
Irfan Sheriff
4d32d81bd7 Fix SDK build
Add the tag and documentation when we open up the high perf mode

Change-Id: I921e46a7519561e59fb917d08a36dd1d3d2fc7f3
2010-08-17 16:45:53 -07:00
Eric Fischer
f870000ff0 Import revised translations. DO NOT MERGE
Change-Id: Id47f0897de1361ba755f149b2886d7d1f79ff494
2010-08-17 16:43:35 -07:00
Daisuke Miyakawa
f996ed9f2e Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread 2010-08-17 16:42:06 -07:00
Daisuke Miyakawa
b7688558cc Make vCard importer/exporter aware of multi-byte parameters.
Bug: 2922186
Change-Id: Ic877940242d87ef918bf8d4dac601d37b296259b
2010-08-17 16:40:47 -07:00
Chia-chi Yeh
3459d3037c RTP: remove froyo-compatible code.
Change-Id: I6822a4e4749a5909959658c29253242b4018aeb0
2010-08-18 07:09:59 +08:00
Irfan Sheriff
8c11e95230 DO NOT MERGE WifiLock extensions for high performance mode
Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: I8b33d307f3d569bc92ba2139b9ed224ffc147547
2010-08-17 15:27:54 -07:00
Steve Howard
8651bd5d18 Fix up handling of null fields in DownloadManager.
Document fields that can have invalid/unknown values, and fix handling
of null local URI.

Change-Id: I7684c151f0a20c91340655246bec2ce0a60328e4
2010-08-17 14:10:25 -07:00