Commit Graph

17414 Commits

Author SHA1 Message Date
Steve Howard
24ebac4991 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.
2010-08-19 08:32:23 -07:00
Steve Howard
036a7b41da Merge "Improve orientation sensing when waking up while flat." into gingerbread 2010-08-19 08:29:29 -07:00
Chia-chi Yeh
79b383a862 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.
2010-08-19 07:59:38 -07:00
Wei-Ta Chen
00b8e7a2fb 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.
2010-08-19 07:59:35 -07:00
Chia-chi Yeh
ba53364b8c Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread 2010-08-19 03:36:36 -07:00
Wei-Ta Chen
81c27d5b29 Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread 2010-08-19 00:28:10 -07:00
Chia-chi Yeh
81f9abb7ec am ae93f52e: Merge "RTP: remove froyo-compatible code." into gingerbread
Merge commit 'ae93f52e4462bbbb5cc908864c20368ac8cbf2a6' into gingerbread-plus-aosp

* commit 'ae93f52e4462bbbb5cc908864c20368ac8cbf2a6':
  RTP: remove froyo-compatible code.
2010-08-18 23:14:16 -07:00
Chia-chi Yeh
10962585a7 Merge "RTP: remove froyo-compatible code." into gingerbread 2010-08-18 23:12:20 -07:00
Jeff Brown
1cf26fb056 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.
2010-08-18 17:52:17 -07:00
Jeff Brown
379b5a69d4 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.
2010-08-18 17:42:47 -07:00
Jeff Brown
6b5e70b701 Merge "Add support for throttling motion events." into gingerbread 2010-08-18 17:40:44 -07:00
Dianne Hackborn
7b94832a30 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
2010-08-18 17:08:36 -07:00
Dianne Hackborn
c278f33a21 Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread 2010-08-18 17:05:40 -07:00
Jeff Brown
542412c8c9 Add support for throttling motion events.
Change-Id: I24b3a17753e91ecda60a60fe5cd2e6b3260e033d
2010-08-18 16:58:27 -07:00
Mathias Agopian
1071c20143 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
2010-08-18 16:34:40 -07:00
Mathias Agopian
5de4b2f272 Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread 2010-08-18 16:31:36 -07:00
Mathias Agopian
031213e5b3 fix [2931161] crash in labyritnth when completing a level
Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
2010-08-18 16:07:34 -07:00
Robert Greenwalt
00b4ee0234 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
2010-08-18 15:14:31 -07:00
Robert Greenwalt
3b74645945 Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread 2010-08-18 15:11:52 -07:00
Brad Fitzpatrick
c17d9867d9 am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Merge commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade' into gingerbread-plus-aosp

* commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade':
  Avoid unnecessary SharedPrefences disk writes.
2010-08-18 14:23:23 -07:00
Brad Fitzpatrick
51a43f351b Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread 2010-08-18 14:21:32 -07:00
Jean-Baptiste Queru
9d941d864a am aac6a748: Merge "Only monitor recognized uevent devices." into gingerbread
Merge commit 'aac6a7481757e3477e489f311e53385988a5d9a0' into gingerbread-plus-aosp

* commit 'aac6a7481757e3477e489f311e53385988a5d9a0':
  Only monitor recognized uevent devices.
2010-08-18 13:59:43 -07:00
Mathias Agopian
12e81afee1 am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread
Merge commit '8ad86fef49a732617dc26be9324af60f9975342d' into gingerbread-plus-aosp

* commit '8ad86fef49a732617dc26be9324af60f9975342d':
  Improve documentation of getAltitude
2010-08-18 13:57:18 -07:00
Mathias Agopian
1339581c92 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.
2010-08-18 13:57:15 -07:00
Jean-Baptiste Queru
8a04624363 Merge "Only monitor recognized uevent devices." into gingerbread 2010-08-18 13:56:58 -07:00
Mathias Agopian
068b82f2ca Merge "Improve documentation of getAltitude" into gingerbread 2010-08-18 13:55:01 -07:00
Mathias Agopian
dbd4c5fe28 Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread 2010-08-18 13:54:46 -07:00
Sean McNeil
2e7a530242 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
Jean-Baptiste Queru
c7c0eb4619 Merge "fix build" into gingerbread-plus-aosp 2010-08-18 13:48:38 -07:00
Jeff Brown
8937aa98b7 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.
2010-08-18 13:42:34 -07:00
Konstantin Lopyrev
d93c1a7750 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.
2010-08-18 13:39:29 -07:00
Jens Gulin
e7b589c202 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
2010-08-18 13:39:24 -07:00
Brian Carlstrom
1e38fb2415 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
2010-08-18 13:39:15 -07:00
Wu-cheng Li
8c079611ee 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.
2010-08-18 13:39:01 -07:00
Andreas Huber
171d93d0f8 am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp

* commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd':
  Make the OggExtractor less verbose.
2010-08-18 13:38:53 -07:00
Andreas Huber
b6b01e24dd 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.
2010-08-18 13:38:49 -07:00
Steve Howard
510c17454e 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.
2010-08-18 13:38:42 -07:00
Kenny Root
5fe75f0097 am face0c02: am 46906276: Amend previous ndc commit
Merge commit 'face0c02a0c47f8585fa578d5a85a8fc37322326' into gingerbread-plus-aosp

* commit 'face0c02a0c47f8585fa578d5a85a8fc37322326':
  Amend previous ndc commit
2010-08-18 13:38:36 -07:00
Jeff Brown
36cb115c77 Merge "Fix some input device mapping bugs with certain drivers." into gingerbread 2010-08-18 13:38:32 -07:00
Kenny Root
0d6832395e 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
2010-08-18 13:38:30 -07:00
David 'Digit' Turner
9a2c69fefe 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
2010-08-18 13:38:24 -07:00
Hung-ying Tyan
3eb37d821f am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread
Merge commit '6ab94608750776bcaaee56696cfcfb16ce29db8a' into gingerbread-plus-aosp

* commit '6ab94608750776bcaaee56696cfcfb16ce29db8a':
  CallManager: add setAudioMode()
2010-08-18 13:37:50 -07:00
Jeff Brown
d64c855821 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
Jeff Brown
62576ec6f3 am 3922484d: Merge "Optimize EventHub reads." into gingerbread
Merge commit '3922484d7458a4ab72fc1ca8952a0776dd1c7d20' into gingerbread-plus-aosp

* commit '3922484d7458a4ab72fc1ca8952a0776dd1c7d20':
  Optimize EventHub reads.
2010-08-18 13:37:44 -07:00
Hung-ying Tyan
1103656b59 am 8eac20ea: SIP: implement conference call
Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp

* commit '8eac20eacd088793547c56e14d602b28d62fb278':
  SIP: implement conference call
2010-08-18 13:37:25 -07:00
Hung-ying Tyan
d0c10c21ce 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.
2010-08-18 13:37:11 -07:00
Eric Fischer
ba5a690cf8 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
2010-08-18 13:36:29 -07:00
Jeff Brown
4c8c491bbb 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.
2010-08-18 13:36:08 -07:00
Irfan Sheriff
cd710eee26 am a1af0d7c: Merge "Fix SDK build" into gingerbread
Merge commit 'a1af0d7c80a0119630926810644e6cdee481ba80' into gingerbread-plus-aosp

* commit 'a1af0d7c80a0119630926810644e6cdee481ba80':
  Fix SDK build
2010-08-18 13:36:01 -07:00
Daisuke Miyakawa
b6f7f8f4b2 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.
2010-08-18 13:35:47 -07:00