Commit Graph

7633 Commits

Author SHA1 Message Date
Grace Kloba
965f42fdf1 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
82fe43131c am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-20 23:26:03 -08:00
Nick Pelly
7c360aaf6c am e834722f: Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Merge commit 'e834722f547d13eaa453464502456892c6225e42' into eclair-plus-aosp

* commit 'e834722f547d13eaa453464502456892c6225e42':
  Fix failure to open AVRCP input device due to EPERM.
2010-01-20 20:46:35 -08:00
Nick Pelly
1a01fad3c3 Merge "Fix failure to open AVRCP input device due to EPERM." into eclair 2010-01-20 20:43:54 -08:00
Nick Pelly
c81bb207c6 Fix failure to open AVRCP input device due to EPERM.
Sleep for 100us and try to open the input device again if it fails, with a
maximum of 10 attempts.

We need the retry logic because setting permissions on a new input device is
racy. The init process watches for new input device (via uevent) and sets the
permission on them in devices.c:make_device(). However at the same time
EventHub.cpp watches for new input devices from the system_server process, and
immediately tries to open them. I can't see a simple way to avoid this race
condition.

As best as I can tell this race condition has always exisited.
There must have been some timing change that happened recently that causes us
to hit this race condition much more often. See repro notes in referenced bug.

Bug: 2375632
2010-01-20 19:56:24 -08:00
Grace Kloba
c944873565 am 8681df90: DO NOT MERGE
Merge commit '8681df902e8cc61d290808c5d78ea48920d30f3b' into eclair-plus-aosp

* commit '8681df902e8cc61d290808c5d78ea48920d30f3b':
  DO NOT MERGE
2010-01-20 19:20:57 -08:00
Mike Reed
1ac35fbecd am a66baccc: Merge "Do not merge" into eclair
Merge commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp

* commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
  Do not merge
2010-01-20 18:35:24 -08:00
Mike Reed
500f9b1400 Merge "Do not merge" into eclair 2010-01-20 18:32:32 -08:00
Xavier Ducrohet
3856f5bd06 am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."
Merge commit 'd1da5fa2da9690be94929e391a4e66b9986573bc' into eclair-plus-aosp

* commit 'd1da5fa2da9690be94929e391a4e66b9986573bc':
  Revert "SDK doc change: Add doc update for NDKr3."
2010-01-20 17:54:12 -08:00
Grace Kloba
4f23abfcb3 am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit '89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp

* commit '89e3c1ab017717b619b27ca312d87918981004ca':
  Fix the sloppy detection in the ScaleGestureDetector.
2010-01-20 17:40:30 -08:00
Grace Kloba
eb2b50e72b Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair 2010-01-20 17:36:50 -08:00
Xavier Ducrohet
a94c829c83 am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair
Merge commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d' into eclair-plus-aosp

* commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d':
  SDK doc change: Add doc update for NDKr3.
2010-01-20 17:33:49 -08:00
Xavier Ducrohet
be2fe55fe2 Merge "SDK doc change: Add doc update for NDKr3." into eclair 2010-01-20 17:30:27 -08:00
Scott Main
060e3af1bb am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Merge commit '2a79defa5a0481e4dd980938da13adc767e0b231' into eclair-plus-aosp

* commit '2a79defa5a0481e4dd980938da13adc767e0b231':
  docs: add guide to copying and installing the Dev Tools app
2010-01-20 17:15:09 -08:00
Scott Main
3166fe7448 Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 2010-01-20 17:10:25 -08:00
Irfan Sheriff
274c516a2a am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
Merge commit '48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp

* commit '48ef378d01b3ace349cbb6ba564276b854d872c9':
  DO NOT MERGE Avoid wifi disable in a UNKNOWN state
2010-01-20 13:30:17 -08:00
Robert Greenwalt
c22753aac1 am 1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Merge commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp

* commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea':
  Add bugreport info about network feature use. DO NOT MERGE
2010-01-20 13:30:11 -08:00
Irfan Sheriff
01357fd7fc Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair 2010-01-20 13:26:08 -08:00
Robert Greenwalt
73f2e99241 Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair 2010-01-20 13:26:04 -08:00
Mike Reed
c3750f3409 am 9f954cf2: Merge "Do not merge" into eclair
Merge commit '9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp

* commit '9f954cf27e9e2bb94c836b1686c0e07500234b27':
  Do not merge
2010-01-20 13:21:26 -08:00
Mike Reed
7bd707a420 Merge "Do not merge" into eclair 2010-01-20 13:17:49 -08:00
Robert Greenwalt
a1b99a24b6 am 8c166512: Merge "Cleanup of process-specific DNS." into eclair
Merge commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b' into eclair-plus-aosp

* commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b':
  Cleanup of process-specific DNS.
2010-01-20 11:12:40 -08:00
Robert Greenwalt
9110cdd7b7 Merge "Cleanup of process-specific DNS." into eclair 2010-01-20 11:08:13 -08:00
Mike Lockwood
3e83c05431 am bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
Merge commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867' into eclair-plus-aosp

* commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867':
  Be tolerant of GPS session and engine on status messages arriving out of order.
2010-01-20 10:04:13 -08:00
Mike Lockwood
7b06197d8a Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair 2010-01-20 10:00:55 -08:00
Xavier Ducrohet
a2ec9a5dc4 am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Merge commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp

* commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678':
  ADT/Layoutlib: implement sweep gradient.
2010-01-20 09:47:06 -08:00
Xavier Ducrohet
5820b33a50 Merge "ADT/Layoutlib: implement sweep gradient." into eclair 2010-01-20 09:43:46 -08:00
Scott Main
a314601e3b am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file
Merge commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp

* commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5':
  docs: a lot of revision and expansion of the hello view tutorials
2010-01-19 19:59:24 -08:00
Adam Powell
2175e4029f am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp

* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
  Edge of screen slop detection for ScaleGestureDetector.
2010-01-19 19:59:19 -08:00
Scott Main
2ffff1b1d2 am de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
Merge commit 'de54a95b98b9d80c10ca2788b83386094222cb4f' into eclair-plus-aosp

* commit 'de54a95b98b9d80c10ca2788b83386094222cb4f':
  docs: add a section about debugging web pages with the Console APIs;
2010-01-19 19:59:13 -08:00
Dianne Hackborn
f1f6ff3f1f am b1c4a2a3: Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
Merge commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7' into eclair-plus-aosp

* commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7':
  Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
2010-01-19 19:59:04 -08:00
Adam Powell
e35804e8d7 Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair 2010-01-19 16:40:17 -08:00
Scott Main
044e2017f7 Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair 2010-01-19 16:18:52 -08:00
Xavier Ducrohet
529b74655a am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair
Merge commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0' into eclair-plus-aosp

* commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0':
  ADT/Layoutlib: implement radial gradient.
2010-01-19 14:53:52 -08:00
Ying Wang
1415f6c8c3 am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair
Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp

* commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
  Add instrumentation as a source tag for proguard keep options.
2010-01-19 14:53:47 -08:00
Xavier Ducrohet
299694ac75 Merge "ADT/Layoutlib: implement radial gradient." into eclair 2010-01-19 14:48:58 -08:00
Ying Wang
6580f62ee6 Merge "Add instrumentation as a source tag for proguard keep options." into eclair 2010-01-19 11:55:12 -08:00
Guang Zhu
1c2e6b87a5 am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
Merge commit 'ccec75e7a842f8ba26617406768206eb3be32222' into eclair-plus-aosp

* commit 'ccec75e7a842f8ba26617406768206eb3be32222':
  Prevent orientation change from triggering activity recreation.
2010-01-19 11:54:05 -08:00
Amith Yamasani
93cf0e8c11 am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
Merge commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp

* commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
  Security fix in accessibility - don't read out password. # 2371557
2010-01-19 11:53:59 -08:00
Guang Zhu
173f7caae8 Merge "Prevent orientation change from triggering activity recreation." into eclair 2010-01-19 11:53:00 -08:00
Amith Yamasani
cf7d227365 Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair 2010-01-19 11:50:39 -08:00
Scott Main
e5f817d984 am 88e653f6: Merge "docs: some spelling typos" into eclair
Merge commit '88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp

* commit '88e653f6653aeb237631681f6700f0e572779617':
  docs: some spelling typos
2010-01-19 11:21:58 -08:00
Scott Main
1808876147 Merge "docs: some spelling typos" into eclair 2010-01-19 11:18:39 -08:00
Grace Kloba
aa09eba872 am f167c4bf: DO NOT MERGE
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp

* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
  DO NOT MERGE
2010-01-18 23:43:37 -08:00
Grace Kloba
fb5587efa1 am 17b14bd3: DO NOT MERGE
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp

* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
  DO NOT MERGE
2010-01-18 23:43:32 -08:00
Grace Kloba
b8d4b14257 am 5a0bf1f0: DO NOT MERGE
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp

* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
  DO NOT MERGE
2010-01-18 23:43:27 -08:00
Grace Kloba
7bd3a10bca am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp

* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
  If ZoomButttonsController detects more than one pointer,
2010-01-18 23:43:20 -08:00
Grace Kloba
12813fd3b7 am f080a5ad: Merge "DO NOT MERGE" into eclair
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp

* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
  DO NOT MERGE
2010-01-18 23:43:14 -08:00
Jim Miller
3665ec2e86 am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp

* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
2010-01-18 23:43:01 -08:00
Xavier Ducrohet
cdbcb8441a am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
Merge commit '908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp

* commit '908a81119061092468067789acbec9b99d79ad5f':
  ADT/Layoutlib: Add dash support to stroke.
2010-01-18 23:42:55 -08:00