Commit Graph

5010 Commits

Author SHA1 Message Date
Dianne Hackborn
46cdf57f34 am b134b203: Merge change Id8c9cb2f into eclair
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:07:54 -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
e5989848f2 am 281acf42: Merge change I52479480 into eclair
Merge commit '281acf421f4b977add75d736d1083413e1d5f24a' into eclair-mr2

* commit '281acf421f4b977add75d736d1083413e1d5f24a':
  Retry overlay create if it fails. Bug 2153980.
2009-10-07 21:14:19 -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
c2a3aa0738 am 7c12540f: Merge change Ibd2197fb into eclair
Merge commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf' into eclair-mr2

* 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:24:09 -07:00
Doug Zongker
315c9a5994 am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-mr2

* commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:24:03 -07:00
Mathias Agopian
d596a5bb25 am 4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-mr2

* commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
  fix [2164183] sometimes device just wants to stay asleep
2009-10-07 18:18:56 -07:00
Mathias Agopian
af275ef4e4 am c7141303: Merge change Id23b791a into eclair
Merge commit 'c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-mr2

* commit 'c71413032e1ad1f166861a980d8547d4106f7fa0':
  fix [2170283] SurfaceFlinger crashes on OOM.
2009-10-07 18:18:50 -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
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
Android (Google) Code Review
22e24aa82e Merge change I8f5e405f into eclair-mr2
* changes:
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
2009-10-07 20:59:21 -04: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
15c2af3efe am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-mr2

* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-07 17:45:14 -07:00
Mathias Agopian
92528edd5b am a2de8e31: Merge change Ie05f07df into eclair
Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-mr2

* commit 'a2de8e31c2693d009db1f9386406758874dd1d40':
  fix [2170319] gmail bulk operation checkbox latency on passion
2009-10-07 17:33:43 -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
ffc9fadd7a am c15934f2: Merge change I7a57637b into eclair
Merge commit 'c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-mr2

* commit 'c15934f26a235a8218f9f673ebf8227acccefff2':
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
2009-10-07 17:07:26 -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
f1cdc25707 am 7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-mr2

* commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c':
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-07 16:36:15 -07:00
Android (Google) Code Review
4f23490970 Merge change Ieed8be00 into eclair
* changes:
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-07 19:26:59 -04:00
Nick Pelly
5b714e98cd am dc2ccb82: Merge change Ia4879943 into eclair
Merge commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa' into eclair-mr2

* commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-07 15:12:26 -07:00
Android (Google) Code Review
dcdd8ba3be Merge change Ia4879943 into eclair
* changes:
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-07 18:04:45 -04:00
Romain Guy
1a81f2677e am 35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits.
Merge commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039' into eclair-mr2

* commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
2009-10-07 14:30:41 -07:00
Android (Google) Code Review
4eb74d7dbd Merge change I6c32aa75 into eclair-mr2
* changes:
  Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
2009-10-07 16:54:30 -04:00
Mike Reed
1314df18da am 64dd5be5: Merge change Ia78b0a2d into eclair
Merge commit '64dd5be583bab8218e54068bbf70edc5fc6087c8' into eclair-mr2

* commit '64dd5be583bab8218e54068bbf70edc5fc6087c8':
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-07 12:33:47 -07:00
Android (Google) Code Review
8e53c5595d Merge change Ia78b0a2d into eclair
* changes:
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-07 15:22:50 -04:00
Android (Google) Code Review
ea88372965 Merge change Ia98129b9 into eclair-mr2
* changes:
  Fix preference caching to increase recycling of preference views.
2009-10-07 15:01:25 -04:00
Eric Fischer
024b1deb21 am e4b6639d: (-s ours) Merge change I9db1edea into eclair
Merge commit 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8' into eclair-mr2

* commit 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8':
  Import revised translations.   DO NOT MERGE
2009-10-07 11:41:26 -07:00
Dianne Hackborn
47dfef1f88 am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-mr2

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 11:41:19 -07:00
Android (Google) Code Review
b1219016f1 Merge change I9db1edea into eclair
* changes:
  Import revised translations.   DO NOT MERGE
2009-10-07 14:36:15 -04:00
Android (Google) Code Review
a81bf16b3c Merge change Ib8f16340 into eclair-mr2
* changes:
  Fix ConnectivityManager permissions check.
2009-10-07 14:36:07 -04:00
Bjorn Bringert
2e64d291ae am 4625758d: Merge change I2c5f1e76 into eclair
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-mr2

* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
  Fix back button handling in ACTV
2009-10-06 22:59:59 -07:00
Android (Google) Code Review
b4055a63dc Merge change I2c5f1e76 into eclair
* changes:
  Fix back button handling in ACTV
2009-10-07 01:55:33 -04:00
Fred Quintana
92cdb51f25 am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-mr2

* commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f':
  changes from Sync Manager API Review: bug 2164262
2009-10-06 22:55:12 -07:00
Mathias Agopian
192bd6950c am 460b60c9: Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c' into eclair-mr2

* commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c':
  Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
2009-10-06 22:34:21 -07:00
Mathias Agopian
67838bc112 Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
This reverts commit c131c5671965b69b0dee3e4afa3b3dd5e3c0c405.

Approved by Hiroshi
2009-10-06 22:23:23 -07:00
Brett Chabot
423b29284d am 773fd131: Merge change I3429f77a into eclair
Merge commit '773fd13130948397cac5178e16d17975a06a738b' into eclair-mr2

* commit '773fd13130948397cac5178e16d17975a06a738b':
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-06 19:42:08 -07:00
Android (Google) Code Review
21fd586f18 Merge change I3429f77a into eclair
* changes:
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-06 22:35:27 -04:00
Mathias Agopian
53ab115b35 am 26fe45dc: Merge change I4961c959 into eclair
Merge commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7' into eclair-mr2

* commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7':
  fix [2152536] ANR in browser
2009-10-06 19:18:06 -07:00
Eric Laurent
c765261f82 am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-mr2

* commit '62443f5f4517ba17d911975e695f1ab75bfdbf77':
  Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
2009-10-06 19:18:00 -07:00
Romain Guy
45fa466494 am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-mr2

* commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
2009-10-06 19:17:55 -07:00
Mathias Agopian
7a7d26453d am c131c567: temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405' into eclair-mr2

* commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405':
  temporarily disable the use of glTexImage2D for sw buffers on sholes.
2009-10-06 19:17:49 -07:00
Mathias Agopian
661bda98e4 am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-mr2

* commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb':
  fix [2168528] enable glTexImage2D code path in SF for software-only buffers
  fix [2168531] have software-only gralloc buffer side-step the HAL
  fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
2009-10-06 19:17:44 -07:00
Jason Sams
f5015d7675 am fe7c2a50: Merge change I996db8da into eclair
Merge commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a' into eclair-mr2

* commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a':
  Fix tls crash on startup if more than one RS contexts are created in one process.
2009-10-06 19:17:38 -07:00
Android (Google) Code Review
c87104f17c Merge change I4961c959 into eclair
* changes:
  fix [2152536] ANR in browser
2009-10-06 22:10:17 -04:00
Mathias Agopian
9ec430adae fix [2152536] ANR in browser
A window is created and the browser is about to render into it the
very first time, at that point it does an IPC to SF to request a new
buffer. Meanwhile, the window manager removes that window from the
list and the shared memory block it uses is marked as invalid.
However, at that point, another window is created and is given the
same index (that just go freed), but a different identity and resets
the "invalid" bit in the shared block. When we go back to the buffer
allocation code, we're stuck because the surface we're allocating for
is gone and we don't detect it's invalid because the invalid bit has
been reset.

It is not sufficient to check for the invalid bit, I should
also check that identities match.
2009-10-06 19:00:57 -07:00