Commit Graph

6386 Commits

Author SHA1 Message Date
Mathias Agopian
b13c02a3db am 846322a9: Merge change Ib96df854 into eclair
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp

* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 16:20:45 -07:00
Android (Google) Code Review
39af502ccc Merge change Ib96df854 into eclair
* changes:
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 19:10:42 -04:00
Mathias Agopian
7d21a745ac add a way to easily catch and log GL errors (compile time flag) 2009-10-08 15:58:11 -07:00
Eric Fischer
5a61cdd675 am aaa6299b: am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-plus-aosp

* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:10:38 -07:00
Jean-Baptiste Queru
b239a5f45d am ea110274: am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-plus-aosp

* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:10:32 -07:00
Mike Lockwood
41da9cdd7b am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 15:10:25 -07:00
Eric Fischer
4b19ae1515 am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '24c8645a995f58885fefcaade0681dd459452deb' into eclair

* commit '24c8645a995f58885fefcaade0681dd459452deb':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:03:24 -07:00
Jean-Baptiste Queru
fa650335e1 am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6' into eclair

* commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:03:15 -07:00
Android (Google) Code Review
e16e1b4d30 Merge change Iee227ace into eclair
* changes:
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 17:58:11 -04:00
Eric Laurent
a849a4eb27 am ff94720b: Merge change I80a6a229 into eclair
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-plus-aosp

* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
2009-10-08 14:47:26 -07:00
Android (Google) Code Review
a82fc0f21b Merge change I80a6a229 into eclair
* changes:
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
2009-10-08 17:36:18 -04:00
Jaikumar Ganesh
079ff45224 am 9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp

* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
  Set the Bond State to NONE when we receive a Agent Cancel.
2009-10-08 13:18:30 -07:00
Android (Google) Code Review
5b4617486a Merge change Ie5d93b7e into eclair
* changes:
  Set the Bond State to NONE when we receive a Agent Cancel.
2009-10-08 16:11:13 -04:00
Eric Laurent
2115412564 Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Added a workarouond to request the A2DP output standby directly to audio hardware when the sink is suspended as it seems that the suspend request often fails.

Also take into account resume requests received while a suspend request is pending.
2009-10-08 12:03:51 -07:00
John Wang
82dfa7a914 am 33e21fcc: Control H icon display in Status bar.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-plus-aosp

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
2009-10-08 11:57:11 -07:00
Romain Guy
32fb50c4ff am 3b36ed09: Merge change I95319bde into eclair
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp

* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
2009-10-08 11:19:14 -07:00
Daisuke Miyakawa
d0bb635496 am 387e73bd: Merge change Ib977f2bd into eclair
Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-plus-aosp

* commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
  Make vCard import Photo from vCard file :(
2009-10-08 11:19:08 -07:00
Android (Google) Code Review
d4bd259ba6 Merge change I95319bde into eclair
* changes:
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
2009-10-08 13:53:54 -04:00
Android (Google) Code Review
6fc8f1c5e4 Merge change Ib977f2bd into eclair
* changes:
  Make vCard import Photo from vCard file :(
2009-10-08 13:49:39 -04:00
Joshua Bartel
7cf211b4a2 am bd324c9b: Merge change I50a321c9 into eclair
Merge commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-plus-aosp

* commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 10:41:13 -07:00
Jean-Baptiste Queru
949a37e984 DO NOT MERGE merge from donut-gms 2009-10-08 10:00:40 -07:00
Android (Google) Code Review
b55acf4902 Merge change I50a321c9 into eclair
* changes:
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 12:58:48 -04:00
San Mehat
2180faea50 am e9296876: Merge change Ib7c34cec into eclair
Merge commit 'e9296876140ba055d311f3f11af25beae652e6d8' into eclair-plus-aosp

* commit 'e9296876140ba055d311f3f11af25beae652e6d8':
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
2009-10-08 08:23:02 -07:00
Android (Google) Code Review
33b9fc3502 Merge change Ib7c34cec into eclair
* changes:
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
2009-10-08 11:11:50 -04:00
Bryan Mawhinney
73590f0e9e am f81ecc1f: Merge change I29232f2a into eclair
Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-plus-aosp

* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
  Only dismiss search dialog after launching intent.
2009-10-08 01:54:30 -07:00
Android (Google) Code Review
8147d73714 Merge change I29232f2a into eclair
* changes:
  Only dismiss search dialog after launching intent.
2009-10-08 04:49:23 -04:00
Fred Quintana
0a071f09b6 am 8bd04b20: Merge change Iea48361d into eclair
Merge commit '8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-plus-aosp

* commit '8bd04b2000f418c8c6f4f628abc215bb5a688244':
  fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
2009-10-08 00:55:03 -07:00
Android (Google) Code Review
b03ef1fbcb Merge change Iea48361d into eclair
* changes:
  fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
2009-10-08 03:50:07 -04:00
Dianne Hackborn
aa90fe37ab am b134b203: Merge change Id8c9cb2f into eclair
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:08:15 -07:00
Android (Google) Code Review
bbc4b4e754 Merge change Id8c9cb2f into eclair
* changes:
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-08 00:58:46 -04:00
Dave Sparks
b0c89aee97 am 281acf42: Merge change I52479480 into eclair
Merge commit '281acf421f4b977add75d736d1083413e1d5f24a' into eclair-plus-aosp

* commit '281acf421f4b977add75d736d1083413e1d5f24a':
  Retry overlay create if it fails. Bug 2153980.
2009-10-07 21:14:29 -07:00
Android (Google) Code Review
5ce17499c6 Merge change I52479480 into eclair
* changes:
  Retry overlay create if it fails. Bug 2153980.
2009-10-08 00:07:05 -04:00
Dave Sparks
587f7830a1 Retry overlay create if it fails. Bug 2153980.
Occasionally we see references to the overlay hanging around long
enough to cause problems in applications when they tried to destroy
the overlay and re-create it. This patch causes the camera HAL to
retry the overlay creation call if it fails every 20ms up to 50
times before it gives up.
2009-10-07 19:22:02 -07:00
Jason Sams
b256783932 am 7c12540f: Merge change Ibd2197fb into eclair
Merge commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf' into eclair-plus-aosp

* commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf':
  Add script to script call support.  Add exception to catch out of bound index data when added to TriangleMeshBuilder.
2009-10-07 18:22:11 -07:00
Doug Zongker
32a3731523 am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-plus-aosp

* commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:22:05 -07:00
Android (Google) Code Review
a6d0e97638 Merge change Ibd2197fb into eclair
* changes:
  Add script to script call support.  Add exception to catch out of bound index data when added to TriangleMeshBuilder.
2009-10-07 21:18:01 -04:00
Mathias Agopian
944f1b5647 am 4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-plus-aosp

* commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
  fix [2164183] sometimes device just wants to stay asleep
2009-10-07 18:17:15 -07:00
Mathias Agopian
80daf7f80f am c7141303: Merge change Id23b791a into eclair
Merge commit 'c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-plus-aosp

* commit 'c71413032e1ad1f166861a980d8547d4106f7fa0':
  fix [2170283] SurfaceFlinger crashes on OOM.
2009-10-07 18:17:09 -07:00
Doug Zongker
1bc1e2a3fd am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '3161795b2353171bb0636fb3ea6dab7dec80a4f4' into eclair

* commit '3161795b2353171bb0636fb3ea6dab7dec80a4f4':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:17:06 -07:00
Android (Google) Code Review
c3f90813a1 Merge change I46b2df15 into eclair
* changes:
  fix [2164183] sometimes device just wants to stay asleep
2009-10-07 21:09:49 -04:00
Android (Google) Code Review
11590bbe1c Merge change Id23b791a into eclair
* changes:
  fix [2170283] SurfaceFlinger crashes on OOM.
2009-10-07 21:07:05 -04:00
Mathias Agopian
d3144beec6 fix [2170283] SurfaceFlinger crashes on OOM.
when running out of memory, a null handle is returned but the error code may not be set.
In that case we need to return NO_MEMORY instead of NO_ERROR, so that the calling code
won't try to dereference the null pointer.
2009-10-07 18:03:35 -07:00
Mathias Agopian
8f2d505216 fix [2164183] sometimes device just wants to stay asleep
When switching rapidily orientation back and forth, surfaces end-up
acquiring the freeze-lock when the first orientation change happens,
but never release it because by the time the 2nd orientation change
comes in, the surface size is back to its original size and
doesn't appear to have resized.

we now always release the freeze-lock when we receive a buffer of the
expected size.
2009-10-07 17:58:29 -07:00
Dianne Hackborn
be98cbde7d am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-plus-aosp

* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-07 17:45:08 -07:00
Mathias Agopian
4fb4aaad82 am a2de8e31: Merge change Ie05f07df into eclair
Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-plus-aosp

* commit 'a2de8e31c2693d009db1f9386406758874dd1d40':
  fix [2170319] gmail bulk operation checkbox latency on passion
2009-10-07 17:34:19 -07:00
Android (Google) Code Review
28541629e1 Merge change Ie05f07df into eclair
* changes:
  fix [2170319] gmail bulk operation checkbox latency on passion
2009-10-07 20:25:08 -04:00
Dmitri Plotnikov
cdd715b189 am c15934f2: Merge change I7a57637b into eclair
Merge commit 'c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-plus-aosp

* commit 'c15934f26a235a8218f9f673ebf8227acccefff2':
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
2009-10-07 17:07:56 -07:00
Android (Google) Code Review
0cb5825a7d Merge change I7a57637b into eclair
* changes:
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
2009-10-07 19:59:07 -04:00
Mathias Agopian
e700501d0e fix [2170319] gmail bulk operation checkbox latency on passion
This also fixes [2152536] ANR in browser

When SF is enqueuing buffers faster than SF dequeues them.
The update flag in SF is not counted and under some situations SF will only
dequeue the first buffer. The state at this point is not technically
corrupted, it's valid, but just delayed by one buffer.

In the case of the Browser ANR, because the last enqueued buffer was delayed
the resizing of the current buffer couldn't happen.

The system would always fall back onto its feet if anything -else- in
tried to draw, because the "late" buffer would be picked up then.
2009-10-07 16:44:10 -07:00
Nick Pelly
6eca6e6a93 am 7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-plus-aosp

* commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c':
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-07 16:36:23 -07:00