Commit Graph

16300 Commits

Author SHA1 Message Date
Jens Gulin
7dcaa58496 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
a50e810d16 Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread 2010-08-18 10:21:28 -07:00
Wu-cheng Li
9912b164a4 Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread 2010-08-18 10:19:45 -07:00
Andreas Huber
933de2215f Merge "Make the OggExtractor less verbose." into gingerbread 2010-08-18 10:10:14 -07:00
Andreas Huber
0e38cd33b6 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
Steve Howard
5b11a5e3cc Merge "Fix up handling of null fields in DownloadManager." into gingerbread 2010-08-18 09:03:34 -07:00
Kenny Root
944290146e 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
4c59005c0a 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
6f6e02db29 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
Hung-ying Tyan
6d8663dd19 Merge "CallManager: add setAudioMode()" into gingerbread 2010-08-17 19:52:50 -07:00
Jeff Brown
186def3faf Merge "Optimize EventHub reads." into gingerbread 2010-08-17 19:41:46 -07:00
Jeff Brown
827630744a Optimize EventHub reads.
Change-Id: Id7d09c0a6e5c741c1e29becd2b6560772c5ff372
2010-08-17 19:40:26 -07:00
Hung-ying Tyan
a71e074ae4 Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread 2010-08-17 17:34:05 -07:00
Eric Fischer
cc930fec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-17 17:19:21 -07:00
Jeff Brown
f9ad410f14 Merge "Fix possible race conditions during channel unregistration." into gingerbread 2010-08-17 17:05:38 -07:00
Jeff Brown
0cacb87f02 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
72722ec49b Merge "Fix SDK build" into gingerbread 2010-08-17 16:48:36 -07:00
Daisuke Miyakawa
6b367d0097 Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread 2010-08-17 16:42:06 -07:00
Roman Nurik
617570672d am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo
Merge commit '3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread

* commit '3b70e159a8168c1154d31d7b0552bb3b0c099334':
  Adding a sample accessibility service -make
2010-08-17 10:45:30 -07:00
Roman Nurik
6f133e8247 Merge "Adding a sample accessibility service -make" into froyo 2010-08-17 10:36:03 -07:00
Steve Howard
29f46e0e48 Merge "New download manager error code when we can't resume." into gingerbread 2010-08-17 08:20:52 -07:00
Mike Lockwood
6cc135ee95 Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread 2010-08-17 04:46:29 -07:00
Jeff Brown
99dd374036 Merge "Throttle userActivity calls from input dispatcher." into gingerbread 2010-08-16 19:59:03 -07:00
Daniel Sandler
e999003f69 Merge "Fix crash in status bar ticker." into gingerbread 2010-08-16 12:22:29 -07:00
Doug Zongker
20b1675614 Merge "add an api for getting a device serial number" into gingerbread 2010-08-16 09:19:40 -07:00
Dianne Hackborn
9521327aa2 Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 2010-08-15 17:33:02 -07:00
Irfan Sheriff
a3c918d9e5 Merge "DO NOT MERGE Fix wifi status icon" into gingerbread 2010-08-15 15:57:47 -07:00
Mathias Agopian
998831fbc3 Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread 2010-08-13 16:29:48 -07:00
Mathias Agopian
f1c468e481 fix a typo that prevented glTexImage2D codepath to work
Change-Id: I36a3bf9d1d2eacd9b14e00b0a6c53bf88bba381c
2010-08-13 16:25:13 -07:00
Robert Greenwalt
f8d7290f08 Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 2010-08-13 15:59:53 -07:00
Dianne Hackborn
cdaaf337e0 Merge "Various battery info things:" into gingerbread 2010-08-13 15:56:29 -07:00
Ying Wang
d5e43c2f3e Merge "Output proguard keep flags for fragment classes." into gingerbread 2010-08-13 15:26:21 -07:00
Jake Hamby
c55241999c Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread 2010-08-13 15:15:36 -07:00
Eric Fischer
d507574d25 Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread 2010-08-13 14:54:15 -07:00
Jake Hamby
9bdf2b0bc1 Merge "Fix typo and bug in CTS test class." into gingerbread 2010-08-13 14:51:09 -07:00
Ficus Kirkpatrick
6f931c1173 am 2abde6e0: Add --max-res-version flag to aapt.
Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread

* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
  Add --max-res-version flag to aapt.
2010-08-13 14:45:39 -07:00
Ficus Kirkpatrick
999a745146 Merge "Add --max-res-version flag to aapt." into gingerbread 2010-08-13 14:22:34 -07:00
Romain Guy
f285cb0975 Merge "fix [2912927] Can't get NV_draw_path extension to work" into gingerbread 2010-08-13 14:18:55 -07:00
Mathias Agopian
4a88b52235 fix [2912927] Can't get NV_draw_path extension to work
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.

Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
2010-08-13 14:17:58 -07:00
Erik Gilling
ae95765868 surfaceflinger: don't check HWComposer numLayers unless one exists
Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c
2010-08-13 10:10:48 -07:00
Eric Laurent
a54831c55e Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread 2010-08-13 08:00:14 -07:00
John Wang
dd978e3337 Merge "Update switch call and accept call." into gingerbread 2010-08-12 17:30:38 -07:00
Mike Dodd
d98ac85c79 Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 2010-08-12 16:45:19 -07:00
Mathias Agopian
72ca07d842 Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread 2010-08-12 15:07:29 -07:00
Mathias Agopian
45721773e1 Fix a couple issues with the new hwcomposer HAL
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list

Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
2010-08-12 15:03:26 -07:00
Trevor Johns
051a4e5fc9 am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo
Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread

* commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795':
  Fix subscribe links for Developer Forums doc.
2010-08-12 14:30:11 -07:00
Trevor Johns
6d79df722b Merge "Fix subscribe links for Developer Forums doc." into froyo 2010-08-12 14:27:33 -07:00
Wu-cheng Li
26105cad7c Merge "Improve camera documentation." into gingerbread 2010-08-12 14:04:07 -07:00
Andreas Huber
240c79ec67 Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread 2010-08-12 11:02:17 -07:00
Andreas Huber
9f2c93d025 Merge "APacketSource is too verbose." into gingerbread 2010-08-12 11:02:06 -07:00