OSDN Git Service
Mathias Agopian [Wed, 18 Aug 2010 23:31:36 +0000 (16:31 -0700)]
Merge "fix [
2931161] crash in labyritnth when completing a level" into gingerbread
Mathias Agopian [Wed, 18 Aug 2010 23:07:34 +0000 (16:07 -0700)]
fix [
2931161] crash in labyritnth when completing a level
Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
Robert Greenwalt [Wed, 18 Aug 2010 22:11:52 +0000 (15:11 -0700)]
Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Brad Fitzpatrick [Wed, 18 Aug 2010 21:21:32 +0000 (14:21 -0700)]
Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Jean-Baptiste Queru [Wed, 18 Aug 2010 20:56:58 +0000 (13:56 -0700)]
Merge "Only monitor recognized uevent devices." into gingerbread
Mathias Agopian [Wed, 18 Aug 2010 20:55:01 +0000 (13:55 -0700)]
Merge "Improve documentation of getAltitude" into gingerbread
Mathias Agopian [Wed, 18 Aug 2010 20:54:46 +0000 (13:54 -0700)]
Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread
Sean McNeil [Wed, 23 Jun 2010 09:00:37 +0000 (16:00 +0700)]
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
Jeff Brown [Wed, 18 Aug 2010 20:38:32 +0000 (13:38 -0700)]
Merge "Fix some input device mapping bugs with certain drivers." into gingerbread
Jeff Brown [Wed, 18 Aug 2010 03:38:35 +0000 (20:38 -0700)]
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
Konstantin Lopyrev [Wed, 18 Aug 2010 18:43:21 +0000 (11:43 -0700)]
Merge "Making sure the draw time is measured." into gingerbread
Jens Gulin [Tue, 22 Jun 2010 20:21:57 +0000 (22:21 +0200)]
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
Brian Carlstrom [Wed, 18 Aug 2010 17:21:28 +0000 (10:21 -0700)]
Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Wu-cheng Li [Wed, 18 Aug 2010 17:19:45 +0000 (10:19 -0700)]
Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Andreas Huber [Wed, 18 Aug 2010 17:10:14 +0000 (10:10 -0700)]
Merge "Make the OggExtractor less verbose." into gingerbread
Andreas Huber [Wed, 18 Aug 2010 17:07:29 +0000 (10:07 -0700)]
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
Steve Howard [Wed, 18 Aug 2010 16:03:34 +0000 (09:03 -0700)]
Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Kenny Root [Wed, 18 Aug 2010 15:50:59 +0000 (08:50 -0700)]
am
46906276: Amend previous ndc commit
Merge commit '
46906276448dd36e7a5cca38fbe9fdb3142f7948' into gingerbread
* commit '
46906276448dd36e7a5cca38fbe9fdb3142f7948':
Amend previous ndc commit
Kenny Root [Wed, 18 Aug 2010 15:50:56 +0000 (08:50 -0700)]
am
a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit '
a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25' into gingerbread
* commit '
a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25':
Add more error checking for ndc
David 'Digit' Turner [Wed, 18 Aug 2010 15:45:35 +0000 (08:45 -0700)]
am
24a03083: PackageManagerService: always install native binaries from .apk
Merge commit '
24a03083ca5cf33342debb9a230a591f098f7fd8' into gingerbread
* commit '
24a03083ca5cf33342debb9a230a591f098f7fd8':
PackageManagerService: always install native binaries from .apk
Mathias Agopian [Wed, 18 Aug 2010 03:19:23 +0000 (20:19 -0700)]
Hung-ying Tyan [Wed, 18 Aug 2010 02:52:50 +0000 (19:52 -0700)]
Merge "CallManager: add setAudioMode()" into gingerbread
Jeff Brown [Wed, 18 Aug 2010 02:41:46 +0000 (19:41 -0700)]
Merge "Optimize EventHub reads." into gingerbread
Jeff Brown [Tue, 17 Aug 2010 23:48:25 +0000 (16:48 -0700)]
Optimize EventHub reads.
Change-Id: Id7d09c0a6e5c741c1e29becd2b6560772c5ff372
Hung-ying Tyan [Wed, 18 Aug 2010 00:34:05 +0000 (17:34 -0700)]
Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Eric Fischer [Wed, 18 Aug 2010 00:19:21 +0000 (17:19 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jeff Brown [Wed, 18 Aug 2010 00:05:38 +0000 (17:05 -0700)]
Merge "Fix possible race conditions during channel unregistration." into gingerbread
Jeff Brown [Tue, 17 Aug 2010 22:59:26 +0000 (15:59 -0700)]
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
Irfan Sheriff [Tue, 17 Aug 2010 23:48:36 +0000 (16:48 -0700)]
Merge "Fix SDK build" into gingerbread
Daisuke Miyakawa [Tue, 17 Aug 2010 23:42:06 +0000 (16:42 -0700)]
Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Roman Nurik [Tue, 17 Aug 2010 17:45:30 +0000 (10:45 -0700)]
am
3b70e159: Merge "Adding a sample accessibility service -make" into froyo
Merge commit '
3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread
* commit '
3b70e159a8168c1154d31d7b0552bb3b0c099334':
Adding a sample accessibility service -make
Roman Nurik [Tue, 17 Aug 2010 17:36:03 +0000 (10:36 -0700)]
Merge "Adding a sample accessibility service -make" into froyo
Steve Howard [Tue, 17 Aug 2010 15:20:52 +0000 (08:20 -0700)]
Merge "New download manager error code when we can't resume." into gingerbread
Mike Lockwood [Tue, 17 Aug 2010 11:46:29 +0000 (04:46 -0700)]
Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread
Jeff Brown [Tue, 17 Aug 2010 02:59:03 +0000 (19:59 -0700)]
Merge "Throttle userActivity calls from input dispatcher." into gingerbread
Daniel Sandler [Mon, 16 Aug 2010 19:22:29 +0000 (12:22 -0700)]
Merge "Fix crash in status bar ticker." into gingerbread
Doug Zongker [Mon, 16 Aug 2010 16:19:40 +0000 (09:19 -0700)]
Merge "add an api for getting a device serial number" into gingerbread
Dianne Hackborn [Mon, 16 Aug 2010 00:33:02 +0000 (17:33 -0700)]
Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread
Irfan Sheriff [Sun, 15 Aug 2010 22:57:47 +0000 (15:57 -0700)]
Merge "DO NOT MERGE Fix wifi status icon" into gingerbread
Mathias Agopian [Fri, 13 Aug 2010 23:29:48 +0000 (16:29 -0700)]
Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread
Mathias Agopian [Fri, 13 Aug 2010 23:25:13 +0000 (16:25 -0700)]
fix a typo that prevented glTexImage2D codepath to work
Change-Id: I36a3bf9d1d2eacd9b14e00b0a6c53bf88bba381c
Robert Greenwalt [Fri, 13 Aug 2010 22:59:53 +0000 (15:59 -0700)]
Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Dianne Hackborn [Fri, 13 Aug 2010 22:56:29 +0000 (15:56 -0700)]
Merge "Various battery info things:" into gingerbread
Ying Wang [Fri, 13 Aug 2010 22:26:21 +0000 (15:26 -0700)]
Merge "Output proguard keep flags for fragment classes." into gingerbread
Jake Hamby [Fri, 13 Aug 2010 22:15:36 +0000 (15:15 -0700)]
Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread
Eric Fischer [Fri, 13 Aug 2010 21:54:15 +0000 (14:54 -0700)]
Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread
Jake Hamby [Fri, 13 Aug 2010 21:51:09 +0000 (14:51 -0700)]
Merge "Fix typo and bug in CTS test class." into gingerbread
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:45:39 +0000 (14:45 -0700)]
am
2abde6e0: Add --max-res-version flag to aapt.
Merge commit '
2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread
* commit '
2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
Add --max-res-version flag to aapt.
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:22:34 +0000 (14:22 -0700)]
Merge "Add --max-res-version flag to aapt." into gingerbread
Romain Guy [Fri, 13 Aug 2010 21:18:55 +0000 (14:18 -0700)]
Merge "fix [
2912927] Can't get NV_draw_path extension to work" into gingerbread
Mathias Agopian [Fri, 13 Aug 2010 19:19:04 +0000 (12:19 -0700)]
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
Erik Gilling [Fri, 13 Aug 2010 06:21:40 +0000 (23:21 -0700)]
surfaceflinger: don't check HWComposer numLayers unless one exists
Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c
Eric Laurent [Fri, 13 Aug 2010 15:00:14 +0000 (08:00 -0700)]
Merge "Fix issue
2909189: System property ro.audio.silent no longer mutes system." into gingerbread
John Wang [Fri, 13 Aug 2010 00:30:38 +0000 (17:30 -0700)]
Merge "Update switch call and accept call." into gingerbread
Mike Dodd [Thu, 12 Aug 2010 23:45:19 +0000 (16:45 -0700)]
Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
Mathias Agopian [Thu, 12 Aug 2010 22:07:29 +0000 (15:07 -0700)]
Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
Mathias Agopian [Thu, 12 Aug 2010 22:03:26 +0000 (15:03 -0700)]
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
Trevor Johns [Thu, 12 Aug 2010 21:30:11 +0000 (14:30 -0700)]
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.
Trevor Johns [Thu, 12 Aug 2010 21:27:33 +0000 (14:27 -0700)]
Merge "Fix subscribe links for Developer Forums doc." into froyo
Wu-cheng Li [Thu, 12 Aug 2010 21:04:07 +0000 (14:04 -0700)]
Merge "Improve camera documentation." into gingerbread
Andreas Huber [Thu, 12 Aug 2010 18:02:17 +0000 (11:02 -0700)]
Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread
Andreas Huber [Thu, 12 Aug 2010 18:02:06 +0000 (11:02 -0700)]
Merge "APacketSource is too verbose." into gingerbread
James Dong [Thu, 12 Aug 2010 17:07:51 +0000 (10:07 -0700)]
Merge "Handle large audio lost" into gingerbread
James Dong [Thu, 12 Aug 2010 17:07:38 +0000 (10:07 -0700)]
Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
James Dong [Thu, 12 Aug 2010 16:13:14 +0000 (09:13 -0700)]
Merge "Fix all fd leaks in authoring engine" into gingerbread
Mathias Agopian [Thu, 12 Aug 2010 00:32:25 +0000 (17:32 -0700)]
Merge "should fix sim build, hopefully" into gingerbread
Mathias Agopian [Thu, 12 Aug 2010 00:31:33 +0000 (17:31 -0700)]
should fix sim build, hopefully
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
Jeff Brown [Thu, 12 Aug 2010 00:22:17 +0000 (17:22 -0700)]
Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread
Mathias Agopian [Wed, 11 Aug 2010 23:24:46 +0000 (16:24 -0700)]
Merge "call into hwcomposer HAL when present" into gingerbread
Mathias Agopian [Wed, 11 Aug 2010 23:21:01 +0000 (16:21 -0700)]
Merge "don't handle the transparent region of a layer in draw()" into gingerbread
Mathias Agopian [Wed, 11 Aug 2010 23:20:38 +0000 (16:20 -0700)]
Merge "get rid of our LayerVector implementation" into gingerbread
Mathias Agopian [Wed, 11 Aug 2010 23:19:16 +0000 (16:19 -0700)]
Merge "keep a list of visible sorted surfaces" into gingerbread
Jeff Brown [Wed, 11 Aug 2010 23:15:48 +0000 (16:15 -0700)]
Merge "Add support for the PointerLocation overlay." into gingerbread
Mathias Agopian [Wed, 11 Aug 2010 00:14:02 +0000 (17:14 -0700)]
call into hwcomposer HAL when present
Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
Mathias Agopian [Wed, 11 Aug 2010 03:42:20 +0000 (20:42 -0700)]
don't handle the transparent region of a layer in draw()
this is already taken into consideration in computeVisibleRegion
and therefore not needed at draw time.
Change-Id: I3fc7336d22f1147dfcd3a20fd71bf79b946d971f
Mathias Agopian [Wed, 11 Aug 2010 01:09:09 +0000 (18:09 -0700)]
get rid of our LayerVector implementation
we now use SortedVector<> with a special compare implementation.
Change-Id: I910459cf3b3c8993b55ad0786a8c348369262de5
Mathias Agopian [Wed, 11 Aug 2010 00:19:56 +0000 (17:19 -0700)]
keep a list of visible sorted surfaces
Change-Id: Ib815eeff894f8a3b1e79fbbf8186d5d91bb60285
Dianne Hackborn [Wed, 11 Aug 2010 22:16:01 +0000 (15:16 -0700)]
Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Jeff Brown [Wed, 11 Aug 2010 21:46:32 +0000 (14:46 -0700)]
Add support for the PointerLocation overlay.
This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications. The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).
Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
Kenny Root [Wed, 11 Aug 2010 21:06:51 +0000 (14:06 -0700)]
Merge "Initial tool for OBB manipulation" into gingerbread
Kenny Root [Wed, 11 Aug 2010 21:06:39 +0000 (14:06 -0700)]
Merge "Move OBB file reading to DefaultContainerService" into gingerbread
Andreas Huber [Wed, 11 Aug 2010 20:20:59 +0000 (13:20 -0700)]
Merge "This code in CameraSource really should hold the lock." into gingerbread
Kenny Root [Mon, 19 Jul 2010 17:31:34 +0000 (10:31 -0700)]
Initial tool for OBB manipulation
Add "obbtool" host command for adding, removing, and querying Opaque
Binary Blob (OBB) information from a file.
Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
Dianne Hackborn [Wed, 11 Aug 2010 07:45:44 +0000 (00:45 -0700)]
Merge "More native work." into gingerbread
Dianne Hackborn [Wed, 4 Aug 2010 18:12:40 +0000 (11:12 -0700)]
More native work.
Implement save/restore of state, and add native APIs for
configuration information.
Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
Hung-ying Tyan [Wed, 11 Aug 2010 03:48:18 +0000 (20:48 -0700)]
Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Yu Shan Emily Lau [Wed, 11 Aug 2010 03:06:39 +0000 (20:06 -0700)]
Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Adam Powell [Wed, 11 Aug 2010 00:52:15 +0000 (17:52 -0700)]
Merge "Fix public bug code.google.com/p/android/issues/detail?id=10067" into gingerbread
Konstantin Lopyrev [Wed, 11 Aug 2010 00:48:27 +0000 (17:48 -0700)]
Merge "Categorizing exported view properties." into gingerbread
Jeff Brown [Tue, 10 Aug 2010 22:47:53 +0000 (15:47 -0700)]
Fix safe mode and KeyEvent.getMaxKeyCode().
Bug:
2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
Jeff Brown [Tue, 10 Aug 2010 23:26:56 +0000 (16:26 -0700)]
Merge "Optimize VelocityTracker to run in linear time." into gingerbread
Andreas Huber [Tue, 10 Aug 2010 21:09:39 +0000 (14:09 -0700)]
Merge "Remove some obsolete code." into gingerbread
Mathias Agopian [Tue, 10 Aug 2010 20:50:22 +0000 (13:50 -0700)]
Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
James Dong [Tue, 10 Aug 2010 20:27:09 +0000 (13:27 -0700)]
Merge "Add input buffer size check for software video encoders" into gingerbread
Andreas Huber [Tue, 10 Aug 2010 19:59:27 +0000 (12:59 -0700)]
Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
Eric Fischer [Tue, 10 Aug 2010 18:54:24 +0000 (11:54 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Rowe [Tue, 10 Aug 2010 18:53:59 +0000 (11:53 -0700)]
am
301c437b: Remove @LargeTest annotations
Merge commit '
301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread
* commit '
301c437b554e2152f3f6fffadc680f5cbf8e8231':
Remove @LargeTest annotations
Andreas Huber [Tue, 10 Aug 2010 18:39:38 +0000 (11:39 -0700)]
Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
James Dong [Tue, 10 Aug 2010 17:41:29 +0000 (10:41 -0700)]
Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
Brett Chabot [Tue, 10 Aug 2010 17:27:48 +0000 (10:27 -0700)]
Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread