Commit Graph

7814 Commits

Author SHA1 Message Date
Jaikumar Ganesh
bfbe8522a7 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
9d5b58991e 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
80a6a229b3 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
Romain Guy
1086329f00 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
4cdb554d19 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
Tadashi G. Takaoka
7c270311f7 am 50b11ec6: Merge change I4d828c3a into eclair-mr2
Merge commit '50b11ec6d955f098c2b8f9cd0573e494442cfc24' into eclair-mr2-plus-aosp

* commit '50b11ec6d955f098c2b8f9cd0573e494442cfc24':
  QuickContactBadge: Make lookup key query asynchronous.
2009-10-08 11:17:14 -07:00
Tadashi G. Takaoka
01fd4e1226 QuickContactBadge: Make lookup key query asynchronous.
Internal Bug: http://b/2130588
2009-10-08 11:06:39 -07:00
Android (Google) Code Review
3b36ed0929 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
387e73bd8f Merge change Ib977f2bd into eclair
* changes:
  Make vCard import Photo from vCard file :(
2009-10-08 13:49:39 -04:00
Romain Guy
a62e4705d5 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
2009-10-08 10:48:54 -07:00
Marc Blank
3c5600eccc Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 08:32:12 -07:00
Jaikumar Ganesh
e5d93b7ed9 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
2009-10-08 04:25:45 -07:00
Bryan Mawhinney
07e6da0b7a am f81ecc1f: Merge change I29232f2a into eclair
Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-mr2

* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
  Only dismiss search dialog after launching intent.
2009-10-08 01:54:50 -07:00
Bryan Mawhinney
5b531da8d6 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
f81ecc1fb7 Merge change I29232f2a into eclair
* changes:
  Only dismiss search dialog after launching intent.
2009-10-08 04:49:23 -04:00
Xia Wang
ec61707d39 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 00:59:29 -07:00
Fred Quintana
293902e36f 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
Fred Quintana
eb329bf2c2 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
2009-10-08 00:54:41 -07:00
Android (Google) Code Review
8bd04b2000 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
c7ed01f401 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 22:13:28 -07:00
Dianne Hackborn
3f4313667e 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
Dianne Hackborn
8c815d9ded 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
Dianne Hackborn
3d163f073f 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
2009-10-07 21:26:57 -07:00
Grace Kloba
6764f2ca44 am a921bf4e: Merge change I8f5e405f into eclair-mr2
Merge commit 'a921bf4e9ff32f4b561af077d11f5dc85ea67d33' into eclair-mr2-plus-aosp

* commit 'a921bf4e9ff32f4b561af077d11f5dc85ea67d33':
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
2009-10-07 18:06:27 -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
fb256574b4 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 17:55:40 -07:00
Daisuke Miyakawa
b977f2bdef Make vCard import Photo from vCard file :(
Internal issue number: 2174296
2009-10-07 17:46:01 -07: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
496b8c5d6b 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
Dianne Hackborn
568cae571a Fix issue #2171460: Turn off background blurring of power dialog
Change-Id: I521629e0ccd0116acf149eeb7476c8474fc7c74a
2009-10-07 17:37:16 -07:00
Nick Pelly
b2ad0f18bc Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 16:41:37 -07:00
Fred Quintana
ea48361d47 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-07 16:36:48 -07:00
Nick Pelly
8af4d8797f 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
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
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
David 'Digit' Turner
4c220bd0f3 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 15:18:09 -07:00
Nick Pelly
825a3b20a7 am dc2ccb82: Merge change Ia4879943 into eclair
Merge commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa' into eclair-plus-aosp

* commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-07 15:12:53 -07: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
ff9c48b304 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 14:38:12 -07: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
Romain Guy
8084b6bc32 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-plus-aosp

* commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
2009-10-07 14:30:37 -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
Amith Yamasani
360fde8eab am 446aeb1c: Merge change Ia98129b9 into eclair-mr2
Merge commit '446aeb1c3d2bb4df3ca73b0d88ef1a7ae0f93d53' into eclair-mr2-plus-aosp

* commit '446aeb1c3d2bb4df3ca73b0d88ef1a7ae0f93d53':
  Fix preference caching to increase recycling of preference views.
2009-10-07 12:09:08 -07:00
Dianne Hackborn
7a889217d7 am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 12:08:20 -07:00
Bjorn Bringert
3d302c8673 am 4625758d: Merge change I2c5f1e76 into eclair
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-plus-aosp

* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
  Fix back button handling in ACTV
2009-10-07 12:01:28 -07: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
Fred Quintana
96de23a7d8 am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-plus-aosp

* commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f':
  changes from Sync Manager API Review: bug 2164262
2009-10-07 12:01:18 -07:00