OSDN Git Service
Romain Guy [Thu, 19 Aug 2010 22:06:50 +0000 (15:06 -0700)]
am
288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw.
Merge commit '
288471d8a57e1c318742cbfc28697877436fdb87' into gingerbread-plus-aosp
* commit '
288471d8a57e1c318742cbfc28697877436fdb87':
DO NOT MERGE. Load assets in place instead of deferring until draw.
Doug Zongker [Thu, 19 Aug 2010 21:07:56 +0000 (14:07 -0700)]
am
a695cbc9: am
0fe27cf5: make android_id random seed depend on time as well as ro.serialno
Merge commit '
a695cbc94355017d02a3a6c17d866776a8eee24c' into gingerbread-plus-aosp
* commit '
a695cbc94355017d02a3a6c17d866776a8eee24c':
make android_id random seed depend on time as well as ro.serialno
Doug Zongker [Thu, 19 Aug 2010 21:05:27 +0000 (14:05 -0700)]
am
0fe27cf5: make android_id random seed depend on time as well as ro.serialno
Merge commit '
0fe27cf5bd1407bc7b4eabefaa91ff535582badc' into gingerbread
* commit '
0fe27cf5bd1407bc7b4eabefaa91ff535582badc':
make android_id random seed depend on time as well as ro.serialno
James Dong [Thu, 19 Aug 2010 21:02:25 +0000 (14:02 -0700)]
am
cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit '
cbd038fe207f183bc7e0a610973473f7c2e9d118' into gingerbread-plus-aosp
* commit '
cbd038fe207f183bc7e0a610973473f7c2e9d118':
Make MediaWriter stop and pause return errors if necessary
James Dong [Thu, 19 Aug 2010 20:59:32 +0000 (13:59 -0700)]
Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Mathias Agopian [Thu, 19 Aug 2010 20:39:56 +0000 (13:39 -0700)]
am
545eab8a: Merge "remove unused pixel format" into gingerbread
Merge commit '
545eab8ae80b070177cc442931eadc8cd980de26' into gingerbread-plus-aosp
* commit '
545eab8ae80b070177cc442931eadc8cd980de26':
remove unused pixel format
Mathias Agopian [Thu, 19 Aug 2010 20:37:35 +0000 (13:37 -0700)]
Merge "remove unused pixel format" into gingerbread
Jeff Brown [Thu, 19 Aug 2010 20:30:08 +0000 (13:30 -0700)]
am
00144745: Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
Merge commit '
0014474569b8bb237f00fa692ab173678bff619e' into gingerbread-plus-aosp
* commit '
0014474569b8bb237f00fa692ab173678bff619e':
Make the throttling more sensitive to end-to-end latency.
Jeff Brown [Thu, 19 Aug 2010 20:27:58 +0000 (13:27 -0700)]
Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread
Jeff Brown [Thu, 19 Aug 2010 18:55:13 +0000 (11:55 -0700)]
Make the throttling more sensitive to end-to-end latency.
The code now takes into account the time when the event was generated.
So with a 60Hz throttling rate, it ensures that a motion event will not
be delayed due to throttling by any more than 1/60th of second past
the time it was generated.
Change-Id: Iaea1d4f76e79036b4a18873485230731c3cd63c3
Mathias Agopian [Thu, 19 Aug 2010 20:11:42 +0000 (13:11 -0700)]
remove unused pixel format
Change-Id: I55bc3cc41385743c07f7e4de06335c922f746f73
Mathias Agopian [Thu, 19 Aug 2010 18:46:43 +0000 (11:46 -0700)]
am
bccfcd95: Merge "fix [
2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
Merge commit '
bccfcd95d3cc4029c1ed8514d31436a857283873' into gingerbread-plus-aosp
* commit '
bccfcd95d3cc4029c1ed8514d31436a857283873':
fix [
2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
Mathias Agopian [Thu, 19 Aug 2010 18:44:50 +0000 (11:44 -0700)]
Merge "fix [
2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread
Andreas Huber [Thu, 19 Aug 2010 18:22:14 +0000 (11:22 -0700)]
am
223e4f73: Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
Merge commit '
223e4f732a325e456ca6151f132f1d4c3c625631' into gingerbread-plus-aosp
* commit '
223e4f732a325e456ca6151f132f1d4c3c625631':
Support for MP4V-ES packetization format according to RFC3016.
Andreas Huber [Thu, 19 Aug 2010 18:19:51 +0000 (11:19 -0700)]
Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
Wu-cheng Li [Thu, 19 Aug 2010 18:10:44 +0000 (11:10 -0700)]
am
eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '
eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp
* commit '
eba1274978911ea188eead128645299669d02f60':
Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
Wu-cheng Li [Thu, 19 Aug 2010 18:10:40 +0000 (11:10 -0700)]
am
ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '
ccb915963e70c9b4e8fc47b5af97ab37b979195a' into gingerbread-plus-aosp
* commit '
ccb915963e70c9b4e8fc47b5af97ab37b979195a':
Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
Wu-cheng Li [Thu, 19 Aug 2010 18:08:39 +0000 (11:08 -0700)]
Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Wu-cheng Li [Thu, 19 Aug 2010 18:08:36 +0000 (11:08 -0700)]
Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Andreas Huber [Thu, 19 Aug 2010 17:56:40 +0000 (10:56 -0700)]
am
f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
Merge commit '
f0ad54846168f07fc1fd7f18cde93deea1559f86' into gingerbread-plus-aosp
* commit '
f0ad54846168f07fc1fd7f18cde93deea1559f86':
In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
Andreas Huber [Thu, 19 Aug 2010 17:54:21 +0000 (10:54 -0700)]
Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
Eric Laurent [Thu, 19 Aug 2010 17:47:01 +0000 (10:47 -0700)]
am
1aaba885: Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Merge commit '
1aaba885def9a3b59edbfe2a0f8c3899948533ff' into gingerbread-plus-aosp
* commit '
1aaba885def9a3b59edbfe2a0f8c3899948533ff':
Audio Effects: fixed "strength supported" parameter size.
Eric Laurent [Thu, 19 Aug 2010 17:42:36 +0000 (10:42 -0700)]
Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
Kenny Root [Thu, 19 Aug 2010 16:11:31 +0000 (09:11 -0700)]
am
54d41379: Merge "Add OBB flags to support overlays" into gingerbread
Merge commit '
54d41379357d1d800d0a7bd7c5dc56111710482a' into gingerbread-plus-aosp
* commit '
54d41379357d1d800d0a7bd7c5dc56111710482a':
Add OBB flags to support overlays
Andreas Huber [Thu, 19 Aug 2010 16:11:28 +0000 (09:11 -0700)]
am
8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Merge commit '
8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a' into gingerbread-plus-aosp
* commit '
8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a':
Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
Kenny Root [Thu, 19 Aug 2010 16:09:32 +0000 (09:09 -0700)]
Merge "Add OBB flags to support overlays" into gingerbread
Andreas Huber [Thu, 19 Aug 2010 16:09:12 +0000 (09:09 -0700)]
Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Eric Laurent [Thu, 19 Aug 2010 15:51:54 +0000 (08:51 -0700)]
am
0b9a12bf: Merge "Fix issue
2929440" into gingerbread
Merge commit '
0b9a12bf8101830fa9bde4015d0043df14cab6db' into gingerbread-plus-aosp
* commit '
0b9a12bf8101830fa9bde4015d0043df14cab6db':
Fix issue
2929440
Eric Laurent [Thu, 19 Aug 2010 15:49:20 +0000 (08:49 -0700)]
Merge "Fix issue
2929440" into gingerbread
Steve Howard [Thu, 19 Aug 2010 15:32:23 +0000 (08:32 -0700)]
am
e0c8582e: Merge "Improve orientation sensing when waking up while flat." into gingerbread
Merge commit '
e0c8582e8a9f2b6eb5ebde667ddd1fddf4652bd4' into gingerbread-plus-aosp
* commit '
e0c8582e8a9f2b6eb5ebde667ddd1fddf4652bd4':
Improve orientation sensing when waking up while flat.
Steve Howard [Thu, 19 Aug 2010 15:29:29 +0000 (08:29 -0700)]
Merge "Improve orientation sensing when waking up while flat." into gingerbread
Chia-chi Yeh [Thu, 19 Aug 2010 14:59:38 +0000 (07:59 -0700)]
am
f49c1689: Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread
Merge commit '
f49c1689b54aec6ce0272c805224625da73e2188' into gingerbread-plus-aosp
* commit '
f49c1689b54aec6ce0272c805224625da73e2188':
RTP: fix few leaks when fail to add streams into a group.
Wei-Ta Chen [Thu, 19 Aug 2010 14:59:35 +0000 (07:59 -0700)]
am
8d124f70: Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread
Merge commit '
8d124f709e5c55f9737a336cda353af3dfb04605' into gingerbread-plus-aosp
* commit '
8d124f709e5c55f9737a336cda353af3dfb04605':
Fix a bug, where one thread is using JNIEnv associated with another thread.
Chia-chi Yeh [Thu, 19 Aug 2010 10:36:36 +0000 (03:36 -0700)]
Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread
Wei-Ta Chen [Thu, 19 Aug 2010 07:28:10 +0000 (00:28 -0700)]
Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread
Chia-chi Yeh [Thu, 19 Aug 2010 06:14:16 +0000 (23:14 -0700)]
am
ae93f52e: Merge "RTP: remove froyo-compatible code." into gingerbread
Merge commit '
ae93f52e4462bbbb5cc908864c20368ac8cbf2a6' into gingerbread-plus-aosp
* commit '
ae93f52e4462bbbb5cc908864c20368ac8cbf2a6':
RTP: remove froyo-compatible code.
Chia-chi Yeh [Thu, 19 Aug 2010 06:12:20 +0000 (23:12 -0700)]
Merge "RTP: remove froyo-compatible code." into gingerbread
Mathias Agopian [Thu, 19 Aug 2010 03:06:34 +0000 (20:06 -0700)]
fix [
2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
a typo prevented the last 2 vertices of a batch to be copied to the front of
the next batch. Instead, the 2 very first vertices were used.
Change-Id: I3c344784dac1cef64df2fb6f6efb2f901cc788db
Jeff Brown [Thu, 19 Aug 2010 00:52:17 +0000 (17:52 -0700)]
am
3d8c9bdb: Raise motion event throttle to 60Hz from 35Hz.
Merge commit '
3d8c9bdbed0c31143227697bd0d94fd234fe08ad' into gingerbread-plus-aosp
* commit '
3d8c9bdbed0c31143227697bd0d94fd234fe08ad':
Raise motion event throttle to 60Hz from 35Hz.
Jeff Brown [Thu, 19 Aug 2010 00:42:47 +0000 (17:42 -0700)]
am
99401b29: Merge "Add support for throttling motion events." into gingerbread
Merge commit '
99401b29c3f39488a058d3eb616009b751879a77' into gingerbread-plus-aosp
* commit '
99401b29c3f39488a058d3eb616009b751879a77':
Add support for throttling motion events.
Jeff Brown [Thu, 19 Aug 2010 00:40:44 +0000 (17:40 -0700)]
Merge "Add support for throttling motion events." into gingerbread
Dianne Hackborn [Thu, 19 Aug 2010 00:08:36 +0000 (17:08 -0700)]
am
cf6d2a1d: Merge "Fix issue #
2845673: android:exported="false" is not obeyed" into gingerbread
Merge commit '
cf6d2a1de274e9a4156b12be811a180eb36412ab' into gingerbread-plus-aosp
* commit '
cf6d2a1de274e9a4156b12be811a180eb36412ab':
Fix issue #
2845673: android:exported="false" is not obeyed
Dianne Hackborn [Thu, 19 Aug 2010 00:05:40 +0000 (17:05 -0700)]
Merge "Fix issue #
2845673: android:exported="false" is not obeyed" into gingerbread
Jeff Brown [Wed, 18 Aug 2010 22:51:08 +0000 (15:51 -0700)]
Add support for throttling motion events.
Change-Id: I24b3a17753e91ecda60a60fe5cd2e6b3260e033d
Mathias Agopian [Wed, 18 Aug 2010 23:34:40 +0000 (16:34 -0700)]
am
17da0663: Merge "fix [
2931161] crash in labyritnth when completing a level" into gingerbread
Merge commit '
17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp
* commit '
17da06631041f9f2237738fb673a74a85b1d9cf4':
fix [
2931161] crash in labyritnth when completing a level
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:14:31 +0000 (15:14 -0700)]
am
6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Merge commit '
6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp
* commit '
6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
DO NOT MERGE Do not kill sockets going default->hipri
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:23:23 +0000 (14:23 -0700)]
am
11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Merge commit '
11709ab07ca2eb97dfa3fc7bb3e0996e65908ade' into gingerbread-plus-aosp
* commit '
11709ab07ca2eb97dfa3fc7bb3e0996e65908ade':
Avoid unnecessary SharedPrefences disk writes.
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:59:43 +0000 (13:59 -0700)]
am
aac6a748: Merge "Only monitor recognized uevent devices." into gingerbread
Merge commit '
aac6a7481757e3477e489f311e53385988a5d9a0' into gingerbread-plus-aosp
* commit '
aac6a7481757e3477e489f311e53385988a5d9a0':
Only monitor recognized uevent devices.
Mathias Agopian [Wed, 18 Aug 2010 20:57:18 +0000 (13:57 -0700)]
am
8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread
Merge commit '
8ad86fef49a732617dc26be9324af60f9975342d' into gingerbread-plus-aosp
* commit '
8ad86fef49a732617dc26be9324af60f9975342d':
Improve documentation of getAltitude
Mathias Agopian [Wed, 18 Aug 2010 20:57:15 +0000 (13:57 -0700)]
am
26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread
Merge commit '
26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp
* commit '
26bcc7b44238ea54105ef5a6020fa5c37bb33f03':
revert hwcomposer HAL changes. DO NOT MERGE.
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
Jean-Baptiste Queru [Wed, 18 Aug 2010 20:48:38 +0000 (13:48 -0700)]
Merge "fix build" into gingerbread-plus-aosp
Jeff Brown [Wed, 18 Aug 2010 20:42:34 +0000 (13:42 -0700)]
am
72e0b2ab: Merge "Fix some input device mapping bugs with certain drivers." into gingerbread
Merge commit '
72e0b2ab08dc49857955a4560de296fdddada8dc' into gingerbread-plus-aosp
* commit '
72e0b2ab08dc49857955a4560de296fdddada8dc':
Fix some input device mapping bugs with certain drivers.
Konstantin Lopyrev [Wed, 18 Aug 2010 20:39:29 +0000 (13:39 -0700)]
am
f2af87b3: Merge "Making sure the draw time is measured." into gingerbread
Merge commit '
f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp
* commit '
f2af87b39b294a197b9a7aaa611a14cfcd669a16':
Making sure the draw time is measured.
Jens Gulin [Wed, 18 Aug 2010 20:39:24 +0000 (13:39 -0700)]
am
c4554b9a: Keep track of remaining fd when devices are removed
Merge commit '
c4554b9a0885ac3713575e91d8d33c5670b52322' into gingerbread-plus-aosp
* commit '
c4554b9a0885ac3713575e91d8d33c5670b52322':
Keep track of remaining fd when devices are removed
Brian Carlstrom [Wed, 18 Aug 2010 20:39:15 +0000 (13:39 -0700)]
am
d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit '
d313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp
* commit '
d313cab46e07c40f4cd1a94304a553e7eb809190':
tracking merge of external/apache-http from dalvik-dev
Wu-cheng Li [Wed, 18 Aug 2010 20:39:01 +0000 (13:39 -0700)]
am
c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit '
c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp
* commit '
c86960236d5b2095c87bf46de2400a905acabee2':
Document that autoFocus must be called in auto and macro mode.
Andreas Huber [Wed, 18 Aug 2010 20:38:53 +0000 (13:38 -0700)]
am
4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '
4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp
* commit '
4dda6ddb25e904c17dcb3012dd229df6ae4692cd':
Make the OggExtractor less verbose.
Andreas Huber [Wed, 18 Aug 2010 20:38:49 +0000 (13:38 -0700)]
am
0324ce9a: 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
Merge commit '
0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp
* commit '
0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
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.
Steve Howard [Wed, 18 Aug 2010 20:38:42 +0000 (13:38 -0700)]
am
baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit '
baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp
* commit '
baf3869b88ab4e31f792dbe08f61725bc3619ea8':
Fix up handling of null fields in DownloadManager.
Kenny Root [Wed, 18 Aug 2010 20:38:36 +0000 (13:38 -0700)]
am
face0c02: am
46906276: Amend previous ndc commit
Merge commit '
face0c02a0c47f8585fa578d5a85a8fc37322326' into gingerbread-plus-aosp
* commit '
face0c02a0c47f8585fa578d5a85a8fc37322326':
Amend previous ndc commit
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
Kenny Root [Wed, 18 Aug 2010 20:38:30 +0000 (13:38 -0700)]
am
e2f95e42: am
a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit '
e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7' into gingerbread-plus-aosp
* commit '
e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7':
Add more error checking for ndc
David 'Digit' Turner [Wed, 18 Aug 2010 20:38:24 +0000 (13:38 -0700)]
am
a6b47cd3: am
24a03083: PackageManagerService: always install native binaries from .apk
Merge commit '
a6b47cd39a1aa01d807bc24839863ce0a0218b46' into gingerbread-plus-aosp
* commit '
a6b47cd39a1aa01d807bc24839863ce0a0218b46':
PackageManagerService: always install native binaries from .apk
Hung-ying Tyan [Wed, 18 Aug 2010 20:37:50 +0000 (13:37 -0700)]
am
6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread
Merge commit '
6ab94608750776bcaaee56696cfcfb16ce29db8a' into gingerbread-plus-aosp
* commit '
6ab94608750776bcaaee56696cfcfb16ce29db8a':
CallManager: add setAudioMode()
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
Jeff Brown [Wed, 18 Aug 2010 20:37:44 +0000 (13:37 -0700)]
am
3922484d: Merge "Optimize EventHub reads." into gingerbread
Merge commit '
3922484d7458a4ab72fc1ca8952a0776dd1c7d20' into gingerbread-plus-aosp
* commit '
3922484d7458a4ab72fc1ca8952a0776dd1c7d20':
Optimize EventHub reads.
Hung-ying Tyan [Wed, 18 Aug 2010 20:37:25 +0000 (13:37 -0700)]
am
8eac20ea: SIP: implement conference call
Merge commit '
8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp
* commit '
8eac20eacd088793547c56e14d602b28d62fb278':
SIP: implement conference call
Hung-ying Tyan [Wed, 18 Aug 2010 20:37:11 +0000 (13:37 -0700)]
am
f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit '
f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp
* commit '
f6354aca3a4d0571a66747d9cdc247a1d411d660':
CallManager: do not deliver ring event if fg call is live.
Eric Fischer [Wed, 18 Aug 2010 20:36:29 +0000 (13:36 -0700)]
am
04e5a1cb: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321' into gingerbread-plus-aosp
* commit '
04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321':
Import revised translations. DO NOT MERGE
Jeff Brown [Wed, 18 Aug 2010 20:36:08 +0000 (13:36 -0700)]
am
72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread
Merge commit '
72ce42352c1c229e05d910b4176f3cddb608e814' into gingerbread-plus-aosp
* commit '
72ce42352c1c229e05d910b4176f3cddb608e814':
Fix possible race conditions during channel unregistration.
Irfan Sheriff [Wed, 18 Aug 2010 20:36:01 +0000 (13:36 -0700)]
am
a1af0d7c: Merge "Fix SDK build" into gingerbread
Merge commit '
a1af0d7c80a0119630926810644e6cdee481ba80' into gingerbread-plus-aosp
* commit '
a1af0d7c80a0119630926810644e6cdee481ba80':
Fix SDK build
Daisuke Miyakawa [Wed, 18 Aug 2010 20:35:47 +0000 (13:35 -0700)]
am
f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Merge commit '
f996ed9f2e4a992e5d884077a15dcc23a8d90c44' into gingerbread-plus-aosp
* commit '
f996ed9f2e4a992e5d884077a15dcc23a8d90c44':
Make vCard importer/exporter aware of multi-byte parameters.
Jean-Baptiste Queru [Wed, 18 Aug 2010 20:20:08 +0000 (13:20 -0700)]
DO NOT MERGE resolved conflicts for merge of
8c11e952 to gingerbread-plus-aosp
Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc
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
Kenny Root [Thu, 12 Aug 2010 14:36:02 +0000 (07:36 -0700)]
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
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