Commit Graph

4118 Commits

Author SHA1 Message Date
Nick Pelly
99f496aab3 am d301c904: Merge change I305c181c into eclair
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-plus-aosp

* commit 'd301c90446644f63cda9b9263f83332676065bb4':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:12:02 -07:00
Nick Pelly
bc1fc05c1b Delay 500ms between each registering each SDP record using sdptool.
This is to workaround an issue where SDP records will fail to register using
sdptool. When we run SystemService.start() it forks sdptool, so if we do this
four times in a row these forked processes can run in parallel, and one or
more of them fails. There is probably some thready safety issue in sdptool
or Bluez that makes it unsafe to run sdptool in parallel.

As a workaround, delay 500ms between each run of sdptool to register SDP
records when starting Bluetooth.

Before this fix it was easy to reproduce problems with service record
registration. If you turn BT off/on multiple times you can see that sometimes
one or more service records are missing. Repro rate is about 20% in my tests.
Result is that remote devices cannot connect to the missing service.

After this fix I am unable to reproduce any missing SDP records, after 30+
cycles of BT on/off. Motorola BT team also ran stress tests overnight with this
fix and were unable to reproduce the missing SDP records.

This is a low risk fix. It does delay some records from being registered
by an additional 1.5 seconds (on top of the 3 second delay we already had),
so if you try and very quickly connect a BT service after turning BT on it
won't work the first time.

Do not merge. (I will use a less hacky fix for MR2/Master)

Change-Id: I305c181c3194e8ce25e3825320cc2e1ef6d3d3cc
Bug: 2180800
DrNo: eastham
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
2009-10-12 10:26:25 -07:00
Jeff Hamilton
34c9c882c4 am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-plus-aosp

* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-10 11:26:43 -07:00
Jeff Hamilton
6dc3f4e553 Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Change-Id: I45af1fe80f6f93a1db8389600dc780af9cedf22c
2009-10-10 12:50:25 -05:00
Fred Quintana
14d330899d am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-plus-aosp

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
2009-10-09 21:15:40 -07:00
Android (Google) Code Review
083a50a394 Merge change I66693ea2 into eclair
* changes:
  fix sync exponential backoff for expedited syncs
2009-10-10 00:10:29 -04:00
Fred Quintana
66693ea208 fix sync exponential backoff for expedited syncs 2009-10-09 16:32:02 -07:00
Grace Kloba
fbe7f6d5ab am 1184313c: Setting WebCore cache limit depending on the memory class.
Merge commit '1184313cbea3b34a4596a90be7081551d36f251a' into eclair-plus-aosp

* commit '1184313cbea3b34a4596a90be7081551d36f251a':
  Setting WebCore cache limit depending on the memory class.
2009-10-09 00:10:32 -07:00
Grace Kloba
1184313cbe Setting WebCore cache limit depending on the memory class.
Fix http://b/issue?id=2176656
2009-10-08 21:01:49 -07:00
Dan Egnor
0051660cea am 6903d5ce: Merge change Iee649a81 into eclair
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp

* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:25:10 -07:00
Android (Google) Code Review
6903d5cedc Merge change Iee649a81 into eclair
* changes:
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads. See bug 2177046.
2009-10-08 23:19:03 -04:00
Dan Egnor
ee649a811b Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
See bug 2177046.
2009-10-08 19:51:51 -07:00
Jim Miller
de6a2bc053 am ad60e7fe: Merge change I9485aec1 into eclair
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-plus-aosp

* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
2009-10-08 19:09:44 -07:00
Dianne Hackborn
93939786f9 am 2c6c5e6e: Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp

* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
  Fix issue #2176944: Need API so browser, others can determine memory size of device
2009-10-08 19:09:38 -07:00
Android (Google) Code Review
ad60e7fe2c Merge change I9485aec1 into eclair
* changes:
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
2009-10-08 22:04:36 -04:00
Jim Miller
9485aec1df Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
BUG=2177367
2009-10-08 18:49:53 -07:00
Dianne Hackborn
2c6c5e6e49 Fix issue #2176944: Need API so browser, others can determine memory size of device
Change-Id: I65d91cdb70df91b67fe84297dd6a94d26a785131
2009-10-08 18:43:47 -07:00
Nick Pelly
899f5f7bba am db7ae10d: Remove STOPSHIP BT logging.
Merge commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738' into eclair-plus-aosp

* commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738':
  Remove STOPSHIP BT logging.
2009-10-08 16:47:19 -07:00
Nick Pelly
eb93eb127e am e6ee3be1: BT API security audit: fix a couple of permission mistakes.
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp

* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
  BT API security audit: fix a couple of permission mistakes.
2009-10-08 16:47:13 -07:00
Nick Pelly
db7ae10d6b Remove STOPSHIP BT logging.
Do not merge.

Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug: 2089423
Joke: Why was Tigger looking in the toilet? To find Pooh
2009-10-09 01:35:11 +02:00
Nick Pelly
e6ee3be1c2 BT API security audit: fix a couple of permission mistakes.
Make functions that are meant to be BLUETOOTH_ADMIN really
BLUETOOTH_ADMIN.

Add some missing javadoc for permissions.

The only functional change here is the BLUETOOTH->BLUETOOTH_ADMIN
changes. This is super safe because every system app that uses BT
has both permissions.

Change-Id: Iddc61f9fd5d81fe0171358665a0fa52f2fa02871
DrNo: eastham
Joke: How do you catch a rabbit? Hide behind a tree and make carrott noises.
2009-10-09 01:35:10 +02:00
Mike Lockwood
a4f6c96f1a 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
Android (Google) Code Review
348b92bd51 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
935c3eb25b 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
ff94720b8b 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
Mike Lockwood
03d246779e 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>
2009-10-08 17:24:21 -04:00
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
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
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
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
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
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
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
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
Daisuke Miyakawa
b977f2bdef Make vCard import Photo from vCard file :(
Internal issue number: 2174296
2009-10-07 17:46:01 -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
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
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
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
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