Commit Graph

8976 Commits

Author SHA1 Message Date
Mathias Agopian
3145c43df4 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
c71413032e Merge change Id23b791a into eclair
* changes:
  fix [2170283] SurfaceFlinger crashes on OOM.
2009-10-07 21:07:05 -04:00
Mathias Agopian
0da41a3635 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
a921bf4e9f Merge change I8f5e405f into eclair-mr2
* changes:
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
2009-10-07 20:59:21 -04:00
Dianne Hackborn
d78fbdddea 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
Dianne Hackborn
568cae571a Fix issue #2171460: Turn off background blurring of power dialog
Change-Id: I521629e0ccd0116acf149eeb7476c8474fc7c74a
2009-10-07 17:37:16 -07:00
Mathias Agopian
18fc0120f5 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
a2de8e31c2 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
c38f6f3301 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
c15934f26a 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
e05f07dffa 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
d7ebc7a42d 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
7a865a5de8 Merge change Ieed8be00 into eclair
* changes:
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-07 19:26:59 -04:00
Dmitri Plotnikov
3fbca4d506 [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Also adding some nicknames from Mike Hearn's list.

Change-Id: I7a57637bbdc267816e5e063fce4d2ac6a3136284
2009-10-07 15:55:21 -07:00
Nick Pelly
f242b7b931 Introduce BluetoothAdapter.getDefaultAdapter().
This is the main entry point to the Bluetooth APIs, and returns the default
local Bluetooth adapter.

It replaces context.getSystemService(Context.BLUETOOTH_SERVICE). This was
never in a public SDK release.

DrNo: eastham
Bug: 2158765
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
Change-Id: Ieed8be009ee5aba621cb69090ee8c8a9c19c840d
2009-10-08 00:27:17 +02:00
Nick Pelly
55a17d6e6d 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
dc2ccb82f9 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
1f42439ad6 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
Nick Pelly
16fb88a673 Encourage developers to connect RFCOMM by UUID instead of Channel.
Hide createRfcommSocket(int channel)
Add createRfcommSocketWithServiceRecord(UUID uuid)

Rename listenUsingRfcomm(String,UUID) -> listenUsingRfcommWithServiceRecord(..)

Now we have a complete API for developers to make peer-peer RFCOMM connections
with hard-coding the limited (30) RFCOMM channels, instead using SDP lookup
of an UUID.

This commit addresses two serious bugs:
- Do not throw IOException on accepting an incoming RFCOMM connection with
  BluetoothSocket. This was a regression from commit 24bb9b8af4
- Workaround failure of bluez to update SDP cache when channel changes by
  trying to use the same RFCOMM channel on the server every time, instead
  of picking server channels randomly. This is a pretty ugly workaround,
  and we are still trying to fix the caching issue - but with this
  workaround we are at least shippable and apps will work at least until
  they start colliding on the 30 RFCOMM channels.

DrNo: eastham
Bug: 2158900
Joke: What did the digital watch say to his mom? "Look mom no hands."
Change-Id: Ia4879943b83afac06b6f1a3f2391cf1628afce7d
2009-10-07 23:25:24 +02:00
Romain Guy
35b38cefcc Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
format when the window is 32 bits.

Change-Id: I46762def67fa7d6a331a75fa8660c6422394ccf2
2009-10-07 14:08:24 -07:00
Android (Google) Code Review
f894d111c8 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
Andreas Huber
8b432b1d85 Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height. 2009-10-07 13:53:24 -07:00
Mike Reed
1665b48f5e 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
64dd5be583 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
446aeb1c3d 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
6756e440c3 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
7e5c5d9752 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
Mike Reed
a78b0a2d9e add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
Knowing that a 32bit bitmap is opaque is a performance boost for some blits.
2009-10-07 11:38:05 -07:00
Android (Google) Code Review
e4b6639dbc Merge change I9db1edea into eclair
* changes:
  Import revised translations.   DO NOT MERGE
2009-10-07 14:36:15 -04:00
Android (Google) Code Review
c24c0e9b5f Merge change Ib8f16340 into eclair-mr2
* changes:
  Fix ConnectivityManager permissions check.
2009-10-07 14:36:07 -04:00
Dianne Hackborn
0c3154d3fc Fix issue #2163654: deadlock, runtime restart
Don't hold a lock when the activity thread is telling the activity manager
to release a provider.

This requires that the activity manager now keep a reference count on the
providers, because without the lock it is possible for activity thread to
call in to request the provider again before it has finished telling
about the release.

Change-Id: I5f912903891f4edae85e28819d4e6f14b8f2e688
2009-10-07 11:10:33 -07:00
Cary Clark
5da9aeb435 reset webTextView size if focus bounds changes
When the focus bounds is changed by webkit, reflect that
change on the UI side in the WebTextView. On the WebCore
side, add the focus-changed state to the Draw record,
which is sent whenever a new picture is recorded.

On the WebView side, set a bit when receiving the Draw
record, and check that bit when the picture is first drawn.
This additional delay is required so that the bit isn't
checked until after the new nav cache is swapped in.

If the bit is set when the draw occurs, clear it, and
set up the WebTextView's bounds.

companion change in external/webkit
fixes http://b/issue?id=2118781
2009-10-07 08:35:40 -04:00
Bjorn Bringert
19400067b2 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
4625758d0b Merge change I2c5f1e76 into eclair
* changes:
  Fix back button handling in ACTV
2009-10-07 01:55:33 -04:00
Fred Quintana
f9f7718f64 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
2504fba7c4 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
Fred Quintana
f038004f4a changes from Sync Manager API Review: bug 2164262 2009-10-06 22:30:48 -07:00
Mathias Agopian
460b60c9b0 Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
This reverts commit c131c56719.

Approved by Hiroshi
2009-10-06 22:23:23 -07:00
Brett Chabot
baa44f1109 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
773fd13130 Merge change I3429f77a into eclair
* changes:
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-06 22:35:27 -04:00
Brett Chabot
b8a4e5f79a Suppress flaky test HeapTest#testOomeLarge.
BUG 2170975
2009-10-06 19:33:24 -07:00
Mathias Agopian
5fd0ea8fb4 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
4e362817ab 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
72da3a467e 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
160e97cb5d 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
0ef55540ab 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
12bb2c4c6d 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
26fe45dcb3 Merge change I4961c959 into eclair
* changes:
  fix [2152536] ANR in browser
2009-10-06 22:10:17 -04:00
Mathias Agopian
4961c959ae 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
Eric Laurent
62443f5f45 Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
This change is a complement to the main fix in kernel driver for the same issue (partner change #1250).
It removes clicks sometimes heard after the end of the tones while audio flinger is sending 0s to the audio output stream.
The problem was that the sleep time between two writes was more than the duration of one audio output stream buffer which could cause some underrun.

Also fixed a recent regression in ToneGenerator that made that the end of previous tone was repeated at the beginning of current one under certain timing circumstances when the maximum tone duration was specified.
2009-10-06 18:59:35 -07:00