OSDN Git Service
Jean-Baptiste Queru [Fri, 9 Oct 2009 00:32:37 +0000 (17:32 -0700)]
am
ea110274: (-s ours) am
ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit '
ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-mr2
* commit '
ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
Import revised translations. DO NOT MERGE
Mike Lockwood [Fri, 9 Oct 2009 00:32:31 +0000 (17:32 -0700)]
am
348b92bd: Merge change Iee227ace into eclair
Merge commit '
348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2
* commit '
348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Eric Laurent [Fri, 9 Oct 2009 00:31:22 +0000 (17:31 -0700)]
am
ff94720b: Merge change I80a6a229 into eclair
Merge commit '
ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-mr2
* commit '
ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Jaikumar Ganesh [Fri, 9 Oct 2009 00:30:34 +0000 (17:30 -0700)]
am
9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '
9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-mr2
* commit '
9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
John Wang [Fri, 9 Oct 2009 00:30:12 +0000 (17:30 -0700)]
am
33e21fcc: Control H icon display in Status bar.
Merge commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2
* commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
Romain Guy [Fri, 9 Oct 2009 00:29:39 +0000 (17:29 -0700)]
am
3b36ed09: Merge change I95319bde into eclair
Merge commit '
3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-mr2
* commit '
3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Daisuke Miyakawa [Fri, 9 Oct 2009 00:29:32 +0000 (17:29 -0700)]
am
387e73bd: Merge change Ib977f2bd into eclair
Merge commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-mr2
* commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
Make vCard import Photo from vCard file :(
Jean-Baptiste Queru [Thu, 8 Oct 2009 22:03:15 +0000 (15:03 -0700)]
am
ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit '
ac62c84a321e2720ab99e37724aba0b6406f39a6' into eclair
* commit '
ac62c84a321e2720ab99e37724aba0b6406f39a6':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 8 Oct 2009 21:58:11 +0000 (17:58 -0400)]
Merge change Iee227ace into eclair
* changes:
GPS: Fix problem with SUPL when SUPL APN is already active.
Android (Google) Code Review [Thu, 8 Oct 2009 21:36:18 +0000 (17:36 -0400)]
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.
Mike Lockwood [Thu, 8 Oct 2009 19:45:03 +0000 (15:45 -0400)]
GPS: Fix problem with SUPL when SUPL APN is already active.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.
Fixes bug b/
2155661
Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Thu, 8 Oct 2009 21:23:21 +0000 (17:23 -0400)]
Merge change Iedebfe8d into eclair-mr2
* changes:
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Andreas Huber [Thu, 8 Oct 2009 18:02:27 +0000 (11:02 -0700)]
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Android (Google) Code Review [Thu, 8 Oct 2009 21:21:07 +0000 (17:21 -0400)]
Merge change Iba087ecc into eclair-mr2
* changes:
Make FWK start a wifi scan if supplicant forgets.
Android (Google) Code Review [Thu, 8 Oct 2009 21:19:10 +0000 (17:19 -0400)]
Merge change I729c3938 into eclair-mr2
* changes:
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Robert Greenwalt [Thu, 8 Oct 2009 00:57:49 +0000 (17:57 -0700)]
Make FWK start a wifi scan if supplicant forgets.
Waits 15sec after getting a DISCONNECTED or INACTIVE state. Also tracks
the number of supplicant state transitions. After the period is up
if we haven't received any more supplicant state transitions, it requests a scan.
bug:
2168081
Android (Google) Code Review [Thu, 8 Oct 2009 20:11:13 +0000 (16:11 -0400)]
Merge change Ie5d93b7e into eclair
* changes:
Set the Bond State to NONE when we receive a Agent Cancel.
Eric Laurent [Thu, 8 Oct 2009 17:58:19 +0000 (10:58 -0700)]
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.
John Wang [Thu, 8 Oct 2009 17:35:27 +0000 (10:35 -0700)]
Control H icon display in Status bar.
Bug
2138275. Add a config setting to control if status bar
should show different icons for UMTS and HSPA connnection.
Android (Google) Code Review [Thu, 8 Oct 2009 18:11:30 +0000 (14:11 -0400)]
Merge change I4d828c3a into eclair-mr2
* changes:
QuickContactBadge: Make lookup key query asynchronous.
Tadashi G. Takaoka [Fri, 2 Oct 2009 01:10:46 +0000 (18:10 -0700)]
QuickContactBadge: Make lookup key query asynchronous.
Internal Bug: http://b/
2130588
Android (Google) Code Review [Thu, 8 Oct 2009 17:53:54 +0000 (13:53 -0400)]
Merge change I95319bde into eclair
* changes:
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Android (Google) Code Review [Thu, 8 Oct 2009 17:49:39 +0000 (13:49 -0400)]
Merge change Ib977f2bd into eclair
* changes:
Make vCard import Photo from vCard file :(
Romain Guy [Thu, 8 Oct 2009 17:48:54 +0000 (10:48 -0700)]
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
This bug was introduced by a change made to query the window's opacity.
Approved by mcleron.
Change-Id: I95319bde72b0faade095bbbbb317e84b9be8efa8
Joshua Bartel [Thu, 8 Oct 2009 17:33:51 +0000 (10:33 -0700)]
am
bd324c9b: Merge change I50a321c9 into eclair
Merge commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-mr2
* commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
LocationManagerService: Fix race when removing LocationListener
Jean-Baptiste Queru [Thu, 8 Oct 2009 17:00:40 +0000 (10:00 -0700)]
DO NOT MERGE merge from donut-gms
Android (Google) Code Review [Thu, 8 Oct 2009 16:58:48 +0000 (12:58 -0400)]
Merge change I50a321c9 into eclair
* changes:
LocationManagerService: Fix race when removing LocationListener
Andreas Huber [Thu, 8 Oct 2009 16:12:11 +0000 (09:12 -0700)]
The vendor is about to check in a fix for this issue, the workaround is no longer needed
Andreas Huber [Thu, 8 Oct 2009 15:41:11 +0000 (08:41 -0700)]
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Since we cannot tell how long it'll take until surface flinger
has displayed the data onscreen, we'll just have to guess...
We must not return the buffer to the decoder before it's been displayed.
San Mehat [Thu, 8 Oct 2009 15:24:16 +0000 (08:24 -0700)]
am
e9296876: Merge change Ib7c34cec into eclair
Merge commit '
e9296876140ba055d311f3f11af25beae652e6d8' into eclair-mr2
* commit '
e9296876140ba055d311f3f11af25beae652e6d8':
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
Android (Google) Code Review [Thu, 8 Oct 2009 15:11:50 +0000 (11:11 -0400)]
Merge change Ib7c34cec into eclair
* changes:
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
San Mehat [Thu, 8 Oct 2009 00:03:00 +0000 (17:03 -0700)]
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
Signed-off-by: San Mehat <san@google.com>
Joshua Bartel [Mon, 5 Oct 2009 16:44:46 +0000 (12:44 -0400)]
LocationManagerService: Fix race when removing LocationListener
In LocationManagerService if a LocationListener is removed while it has
a pending broadcast the wake lock held while pending broadcasts are
outstanding do not get cleared properly.
There are 2 cases of this race that are fixed:
1. locationCallbackFinished was changed to check the mReceivers HashMap
directly instead of calling getReceiver. getReceiver would add the
ILocationListener as a new Receiver if it did not exist which caused
a receiver that was removed when it still had a broadcast pending to
be added back in a bad state when the pending broadcast completed.
2. removeUpdatesLocked was changed to decrement the pending broadcasts
when a Receiver is removed that has pending broadcasts.
Fixes bug b/
2163871
Change-Id: I50a321c9b3359bf69845236dc4a4b9e38e847335
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jaikumar Ganesh [Thu, 8 Oct 2009 09:27:52 +0000 (02:27 -0700)]
Set the Bond State to NONE when we receive a Agent Cancel.
Sometimes during OPP, we can get stuck in Pairing state when the remote
end, cancels the Pairing process - we will just get onAgentCancel
and thus not set the Pairing state properly.
DrNo: Eastham
Bug:
2174874
Bryan Mawhinney [Thu, 8 Oct 2009 08:54:50 +0000 (01:54 -0700)]
am
f81ecc1f: Merge change I29232f2a into eclair
Merge commit '
f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-mr2
* commit '
f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
Only dismiss search dialog after launching intent.
Android (Google) Code Review [Thu, 8 Oct 2009 08:49:23 +0000 (04:49 -0400)]
Merge change I29232f2a into eclair
* changes:
Only dismiss search dialog after launching intent.
Fred Quintana [Thu, 8 Oct 2009 07:54:41 +0000 (00:54 -0700)]
am
8bd04b20: Merge change Iea48361d into eclair
Merge commit '
8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-mr2
* 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
Android (Google) Code Review [Thu, 8 Oct 2009 07:50:07 +0000 (03:50 -0400)]
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
Dianne Hackborn [Thu, 8 Oct 2009 05:07:54 +0000 (22:07 -0700)]
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
Android (Google) Code Review [Thu, 8 Oct 2009 04:58:46 +0000 (00:58 -0400)]
Merge change Id8c9cb2f into eclair
* changes:
More fix #
2163209: alarm clock rings but is hidden behind lock screen
Dianne Hackborn [Thu, 8 Oct 2009 04:26:57 +0000 (21:26 -0700)]
More fix #
2163209: alarm clock rings but is hidden behind lock screen
There was another way we could ignore the application windows flags
while the lock screen was displayed. This is the infrastructure to
deal with that.
Change-Id: Id8c9cb2f7081df6757ccb797a7cde618e82f7b38
Dave Sparks [Thu, 8 Oct 2009 04:14:19 +0000 (21:14 -0700)]
am
281acf42: Merge change I52479480 into eclair
Merge commit '
281acf421f4b977add75d736d1083413e1d5f24a' into eclair-mr2
* commit '
281acf421f4b977add75d736d1083413e1d5f24a':
Retry overlay create if it fails. Bug
2153980.
Android (Google) Code Review [Thu, 8 Oct 2009 04:07:05 +0000 (00:07 -0400)]
Merge change I52479480 into eclair
* changes:
Retry overlay create if it fails. Bug
2153980.
Dave Sparks [Thu, 8 Oct 2009 02:18:20 +0000 (19:18 -0700)]
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.
Jason Sams [Thu, 8 Oct 2009 01:24:09 +0000 (18:24 -0700)]
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.
Doug Zongker [Thu, 8 Oct 2009 01:24:03 +0000 (18:24 -0700)]
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
Mathias Agopian [Thu, 8 Oct 2009 01:18:56 +0000 (18:18 -0700)]
am
4ff6d01d: Merge change I46b2df15 into eclair
Merge commit '
4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-mr2
* commit '
4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
fix [
2164183] sometimes device just wants to stay asleep
Mathias Agopian [Thu, 8 Oct 2009 01:18:50 +0000 (18:18 -0700)]
am
c7141303: Merge change Id23b791a into eclair
Merge commit '
c71413032e1ad1f166861a980d8547d4106f7fa0' into eclair-mr2
* commit '
c71413032e1ad1f166861a980d8547d4106f7fa0':
fix [
2170283] SurfaceFlinger crashes on OOM.
Android (Google) Code Review [Thu, 8 Oct 2009 01:18:01 +0000 (21:18 -0400)]
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.
Doug Zongker [Thu, 8 Oct 2009 01:17:06 +0000 (18:17 -0700)]
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
Jason Sams [Thu, 8 Oct 2009 01:14:01 +0000 (18:14 -0700)]
Add script to script call support. Add exception to catch out of bound index data when added to TriangleMeshBuilder.
Android (Google) Code Review [Thu, 8 Oct 2009 01:09:49 +0000 (21:09 -0400)]
Merge change I46b2df15 into eclair
* changes:
fix [
2164183] sometimes device just wants to stay asleep
Android (Google) Code Review [Thu, 8 Oct 2009 01:07:05 +0000 (21:07 -0400)]
Merge change Id23b791a into eclair
* changes:
fix [
2170283] SurfaceFlinger crashes on OOM.
Mathias Agopian [Tue, 6 Oct 2009 22:58:44 +0000 (15:58 -0700)]
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.
Android (Google) Code Review [Thu, 8 Oct 2009 00:59:21 +0000 (20:59 -0400)]
Merge change I8f5e405f into eclair-mr2
* changes:
mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
Mathias Agopian [Thu, 8 Oct 2009 00:58:29 +0000 (17:58 -0700)]
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.
Daisuke Miyakawa [Thu, 8 Oct 2009 00:25:50 +0000 (17:25 -0700)]
Make vCard import Photo from vCard file :(
Internal issue number:
2174296
Dianne Hackborn [Thu, 8 Oct 2009 00:45:14 +0000 (17:45 -0700)]
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
Dianne Hackborn [Wed, 7 Oct 2009 23:13:39 +0000 (16:13 -0700)]
Fix issue #
2171460: Turn off background blurring of power dialog
Change-Id: I521629e0ccd0116acf149eeb7476c8474fc7c74a
Mathias Agopian [Thu, 8 Oct 2009 00:33:43 +0000 (17:33 -0700)]
am
a2de8e31: Merge change Ie05f07df into eclair
Merge commit '
a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-mr2
* commit '
a2de8e31c2693d009db1f9386406758874dd1d40':
fix [
2170319] gmail bulk operation checkbox latency on passion
Android (Google) Code Review [Thu, 8 Oct 2009 00:25:08 +0000 (20:25 -0400)]
Merge change Ie05f07df into eclair
* changes:
fix [
2170319] gmail bulk operation checkbox latency on passion
Doug Zongker [Wed, 7 Oct 2009 22:14:03 +0000 (15:14 -0700)]
when logging free space on /data, log /system and /cache as well
Report space free on system and cache so we can estimate bad block
statistics for devices in the field.
Dmitri Plotnikov [Thu, 8 Oct 2009 00:07:26 +0000 (17:07 -0700)]
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.
Android (Google) Code Review [Wed, 7 Oct 2009 23:59:07 +0000 (19:59 -0400)]
Merge change I7a57637b into eclair
* changes:
[Issue
2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Mathias Agopian [Wed, 7 Oct 2009 23:44:10 +0000 (16:44 -0700)]
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.
Fred Quintana [Wed, 7 Oct 2009 23:36:48 +0000 (16:36 -0700)]
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug
2171204
Nick Pelly [Wed, 7 Oct 2009 23:36:15 +0000 (16:36 -0700)]
am
7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '
7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-mr2
* commit '
7a865a5de8214aa4975371b9d8a2165a01f6b69c':
Introduce BluetoothAdapter.getDefaultAdapter().
Android (Google) Code Review [Wed, 7 Oct 2009 23:26:59 +0000 (19:26 -0400)]
Merge change Ieed8be00 into eclair
* changes:
Introduce BluetoothAdapter.getDefaultAdapter().
Dmitri Plotnikov [Wed, 7 Oct 2009 00:57:16 +0000 (17:57 -0700)]
[Issue
2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Also adding some nicknames from Mike Hearn's list.
Change-Id: I7a57637bbdc267816e5e063fce4d2ac6a3136284
Nick Pelly [Wed, 7 Oct 2009 22:12:45 +0000 (00:12 +0200)]
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
Nick Pelly [Wed, 7 Oct 2009 22:12:26 +0000 (15:12 -0700)]
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.
Android (Google) Code Review [Wed, 7 Oct 2009 22:04:45 +0000 (18:04 -0400)]
Merge change Ia4879943 into eclair
* changes:
Encourage developers to connect RFCOMM by UUID instead of Channel.
Romain Guy [Wed, 7 Oct 2009 21:30:41 +0000 (14:30 -0700)]
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
Nick Pelly [Wed, 7 Oct 2009 05:44:03 +0000 (07:44 +0200)]
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
24bb9b8af4ff6915
- 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
Romain Guy [Wed, 7 Oct 2009 20:38:55 +0000 (13:38 -0700)]
Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
format when the window is 32 bits.
Change-Id: I46762def67fa7d6a331a75fa8660c6422394ccf2
Android (Google) Code Review [Wed, 7 Oct 2009 20:54:30 +0000 (16:54 -0400)]
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.
Andreas Huber [Wed, 7 Oct 2009 20:36:52 +0000 (13:36 -0700)]
Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
Mike Reed [Wed, 7 Oct 2009 19:33:47 +0000 (12:33 -0700)]
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.
Android (Google) Code Review [Wed, 7 Oct 2009 19:22:50 +0000 (15:22 -0400)]
Merge change Ia78b0a2d into eclair
* changes:
add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
Android (Google) Code Review [Wed, 7 Oct 2009 19:01:25 +0000 (15:01 -0400)]
Merge change Ia98129b9 into eclair-mr2
* changes:
Fix preference caching to increase recycling of preference views.
Eric Fischer [Wed, 7 Oct 2009 18:41:26 +0000 (11:41 -0700)]
am
e4b6639d: (-s ours) Merge change I9db1edea into eclair
Merge commit '
e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8' into eclair-mr2
* commit '
e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Wed, 7 Oct 2009 18:41:19 +0000 (11:41 -0700)]
am
0c3154d3: Fix issue #
2163654: deadlock, runtime restart
Merge commit '
0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-mr2
* commit '
0c3154d3fc54a1b3d8358a2932042cca729327b9':
Fix issue #
2163654: deadlock, runtime restart
Mike Reed [Wed, 7 Oct 2009 18:38:05 +0000 (11:38 -0700)]
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.
Android (Google) Code Review [Wed, 7 Oct 2009 18:36:15 +0000 (14:36 -0400)]
Merge change I9db1edea into eclair
* changes:
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 7 Oct 2009 18:36:07 +0000 (14:36 -0400)]
Merge change Ib8f16340 into eclair-mr2
* changes:
Fix ConnectivityManager permissions check.
Dianne Hackborn [Wed, 7 Oct 2009 00:18:05 +0000 (17:18 -0700)]
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
Cary Clark [Tue, 6 Oct 2009 21:40:53 +0000 (17:40 -0400)]
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
Bryan Mawhinney [Wed, 7 Oct 2009 12:02:35 +0000 (13:02 +0100)]
Only dismiss search dialog after launching intent.
This fixes an NPE that occurs when launching the intent
tries to access state cleared by onStop.
Bug:
2171752
Change-Id: I29232f2a44d8dfa27b2c79933093c0c8983b2e92
Bjorn Bringert [Wed, 7 Oct 2009 05:59:59 +0000 (22:59 -0700)]
am
4625758d: Merge change I2c5f1e76 into eclair
Merge commit '
4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-mr2
* commit '
4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
Fix back button handling in ACTV
Android (Google) Code Review [Wed, 7 Oct 2009 05:55:33 +0000 (01:55 -0400)]
Merge change I2c5f1e76 into eclair
* changes:
Fix back button handling in ACTV
Fred Quintana [Wed, 7 Oct 2009 05:55:12 +0000 (22:55 -0700)]
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
Mathias Agopian [Wed, 7 Oct 2009 05:34:21 +0000 (22:34 -0700)]
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."
Fred Quintana [Wed, 7 Oct 2009 00:05:58 +0000 (17:05 -0700)]
changes from Sync Manager API Review: bug
2164262
Mathias Agopian [Wed, 7 Oct 2009 05:23:23 +0000 (22:23 -0700)]
Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
This reverts commit
c131c5671965b69b0dee3e4afa3b3dd5e3c0c405.
Approved by Hiroshi
Brett Chabot [Wed, 7 Oct 2009 02:42:08 +0000 (19:42 -0700)]
am
773fd131: Merge change I3429f77a into eclair
Merge commit '
773fd13130948397cac5178e16d17975a06a738b' into eclair-mr2
* commit '
773fd13130948397cac5178e16d17975a06a738b':
Suppress flaky test HeapTest#testOomeLarge.
Android (Google) Code Review [Wed, 7 Oct 2009 02:35:27 +0000 (22:35 -0400)]
Merge change I3429f77a into eclair
* changes:
Suppress flaky test HeapTest#testOomeLarge.
Brett Chabot [Wed, 7 Oct 2009 02:13:31 +0000 (19:13 -0700)]
Suppress flaky test HeapTest#testOomeLarge.
BUG
2170975
Mathias Agopian [Wed, 7 Oct 2009 02:18:06 +0000 (19:18 -0700)]
am
26fe45dc: Merge change I4961c959 into eclair
Merge commit '
26fe45dcb3df12eda94d93f1473cd6a2f5f345c7' into eclair-mr2
* commit '
26fe45dcb3df12eda94d93f1473cd6a2f5f345c7':
fix [
2152536] ANR in browser
Eric Laurent [Wed, 7 Oct 2009 02:18:00 +0000 (19:18 -0700)]
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).
Romain Guy [Wed, 7 Oct 2009 02:17:55 +0000 (19:17 -0700)]
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.