Commit Graph

31 Commits

Author SHA1 Message Date
Jaikumar Ganesh
659b39abf8 Update BT APIs for change in return type.
Change-Id: Ic85b47da50876fd6bdc6e223af4248a8586d82bc
2010-10-22 11:12:48 -07:00
Jaikumar Ganesh
5809d33296 Update code for public Bluetooth APIs
Change-Id: Iab22e4ae3206f9085b2d53b8b18dc2abd6197226
2010-09-28 17:53:02 -07:00
Jake Hamby
dd79a33ba5 Auto-connect Bluetooth device only when user initiates pairing.
Fix bug 2271901: do not auto-connect to services on a BT device
when pairing was initiated by the device (e.g. for OPP file transfer).

Also corrected some typos and removed an unneeded lock object in
LocalBluetoothManager (synchronize on .class object instead, like
android.bluetooth.BluetoothDevice.getService() does).

Change-Id: I121105c6eee2658129f6094786754bbc7932d324
2010-09-24 14:23:26 -07:00
Brad Fitzpatrick
c5c8dad0af Use new apply() instead of commit().
apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9
2010-09-14 09:26:51 -07:00
Michael Chan
76098b7f7a b/2310373 Show pairing dialogs if the device has been scanning for bt devices recently.
Change-Id: Iec9eb37a5e79b63cc3cf226e2ead6d9ed06d56a6
2010-03-03 12:35:49 -08:00
Michael Chan
20b0ae927e am 488a80a7: Merge change Id587a517 into eclair
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-mr2

* commit '488a80a7b111f5906bf51101785a95a6c640d265':
  b/2314560 Prevent PIN dialog from showing up on undocked docks
2009-12-10 17:41:23 -08:00
Michael Chan
d617a0781c b/2314560 Prevent PIN dialog from showing up on undocked docks
If unpaired while undocked, device will be removed from the BT device list.
If unpaired while docked, the user can do pair and connect. No PIN dialog will pop up.
If undocked after unpaired, device will be removed from the BT device list.

Change-Id: Id587a517999e08641451f78dec8696a06028cf16
2009-12-09 17:16:46 -08:00
Michael Chan
4fcf94c47b am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
2009-11-10 11:06:36 -08:00
Michael Chan
5469ff8b3f b/2226832 Showing Pairing Dialog in the foreground
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery.  Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
2009-11-10 10:37:54 -08:00
Michael Chan
81cdaff7b5 b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
Change-Id: Ib4dd6254c90da619e853b1be22fba3ff1365258e
2009-10-08 11:55:47 -07:00
Nick Pelly
d1a04291c5 Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug: 2158765
Joke: When is a car not a car? When it turns into a driveway.
2009-10-08 01:03:34 +02:00
Michael Chan
f2f3ceebbd b/2138890 Pre-initilize Bluetooth profile managers
Change-Id: I633202457ca445308ec35b99260e603a85451042
2009-09-24 07:45:49 -07:00
Jaikumar Ganesh
363bd5554e Fix string name for bluetooth pairing and fix NPE
Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
2009-09-16 14:56:08 -07:00
Jaikumar Ganesh
3eb43fe7a4 Show name for incoming pairing requests.
Settings apps invalidates its cache whenever a new scan is started.
When there is a new incoming pairing request, we will not get a DeviceFound
signal, because its not due to a inquiry scan. Thus when the pairing request
is displayed, the settings app doesn't have it in cache and hence will
just display the address. Make it query the framework when it doesn't have the name.
2009-09-15 14:07:22 -07:00
Jaikumar Ganesh
5f23cb39a1 Modify settings for 2.1
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
2009-09-11 12:00:14 -07:00
Nick Pelly
16cc86315d Update application for Bluetooth API changes.
Change-Id: I8351611f0f0c5eda3e423dbe7e7b53e52d75ac36
2009-09-10 18:44:25 -07:00
Nick Pelly
f4779354b3 Update application for Bluetooth API change: deprecation of BluetoothError. 2009-09-08 17:49:57 -07:00
Nick Pelly
ca564d6bda Update application for Bluetooth API change. 2009-09-08 16:24:03 -07:00
Nick Pelly
d63c011225 Bluetooth: Update Settings.apk to match BT API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
                  adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
                 (pair, connect, etc).
2009-08-17 17:09:44 -07:00
Jaikumar Ganesh
91b33f1462 Settings app changes for Bluez4. 2009-06-08 17:28:06 -07:00
Michael Chan
5ffbb91013 Reenable verbose logging for post-donut 2009-04-30 16:33:42 -07:00
Michael Chan
f25063aee3 Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
In the BroadcastReceiver, pickup the new bluetooth status from the intent instead
of calling back to LocalBluetoothManager.  There could be race condition since
LocalBluetoothManager itself gets the same info via the BroadcastReceiver mechanism.
Also cleaned up logs.
2009-04-29 14:17:06 -07:00
Michael Chan
1739bfb333 AI 143480: Fixed the problem where Settings would crash if you enable airplane mode, go
Home, go back to Wireless Settings. This only happens in emulator. Bluetooth
  isn't supported in emulator but the crash was fixed so users can
  enable/disable Airplane Mode.
  BUG=1741119

Automated import of CL 143480
2009-03-30 09:40:42 -07:00
The Android Open Source Project
e6dd1fa185 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:48 -07:00
The Android Open Source Project
afc4ab2ffb auto import from //depot/cupcake/@135843 2009-03-03 19:32:34 -08:00
The Android Open Source Project
4e14e5ccbf auto import from //depot/cupcake/@135843 2009-03-03 18:28:52 -08:00
The Android Open Source Project
a578a6c4ad auto import from //depot/cupcake/@132589 2009-03-03 14:04:35 -08:00
The Android Open Source Project
8a156091ef auto import from //depot/cupcake/@137055 2009-03-02 22:54:43 -08:00
The Android Open Source Project
1feaa85791 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:05 -08:00
The Android Open Source Project
590c0a97ff auto import from //branches/cupcake/...@127436 2009-01-22 00:13:44 -08:00
The Android Open Source Project
abc48f80d8 Code drop from //branches/cupcake/...@124589 2008-12-17 18:06:01 -08:00