Commit Graph

293 Commits

Author SHA1 Message Date
Ravi Nagarajan
82e57fe174 Reset priority on unbond
Change-Id: I8232c666bde26235ad527c96e5218fc1b3e7a1db
2012-07-26 19:20:32 -07:00
Swaminatha Balaji
c61eb2617d Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled
Change-Id: I82d05eacb6c7fae6eb1ebf246d2fce7314ff0a75
2012-07-26 19:19:51 -07:00
Syed Ibrahim M
305f240dc1 handle NullPointerException in cases where a proxy
call to AdapterService is called after Adapter
Service is stopped.

Change-Id: I009787f03f9a013b9b06fcb7e3f6241c850f8cd2
2012-07-26 18:11:23 -07:00
Fred
a8c6df0d3a Removed startService() call from BluetoothManagerService.
BT enable()/disable() are handled by using the binder interface

Change-Id: I0bb8d4984129706e424320241ca3ea7e12caf0d3

Conflicts:

	core/java/android/bluetooth/IBluetooth.aidl
2012-07-16 21:29:44 -07:00
Matthew Xie
9631314e3d Fix merge error, put in tmp workaround for input manager.
Fix merge error, missing enableNoAutoConnect api.
Remove bluetoothF from inputManageF.systemReady call as tmp workaround.
Recover shutdownRadios(MAX_RADIO_WAIT_TIME) call in ShutdownThread

Change-Id: Ice2b5c54267755bdbf56c742feabbb8709b92570
2012-07-16 21:29:12 -07:00
fredc
bf072a712f Moved BluetoothAdapter.ACTION_STATE_CHANGED broadcast from AdapterService to BluetoothManagerService
Change-Id: I88e5f3fe050cf11eae9c5cf1b7c393a178b8f9b1
2012-07-16 21:28:12 -07:00
Swaminatha Balaji
20738945d4 Auto connect hf/a2dp
Change-Id: I7c1fb4e2614f65e6810f195814dcf0cad88aee21
2012-07-16 21:26:46 -07:00
zzy
7329e70841 Added code to tear down dhcp thread when tethering is off 2012-07-16 21:25:57 -07:00
fredc
d6883533e4 Fixed socket not closing on BT off. Used RemoteCallbackList to monitor binder deaths in BluetoothManagerService.
Change-Id: I524964bd2836d8c5a4bae095b93ac9481337941d
2012-07-16 21:25:05 -07:00
fredc
903ac6f399 Fixed issue with Settings app crashing after during on/off and unpair.
Fixed issue with BluetoothAdapter.getRemoteDevice() returning null.

Change-Id: Ie86813532530a6b57bde1c430c7b4875ecc7354c
2012-07-16 21:24:32 -07:00
Ravi Nagarajan
7077272d8f Disable debug logs in BluetoothDevice, that was turned on accidentally Change-Id: I8a0a3f5775c2b9f5a928e4840851e687f25b57ab 2012-07-16 21:24:09 -07:00
fredc
116d1d4696 Fixed issue with getting Bluetooth adapter's name and airplane mode
Change-Id: I18b632223574aa41b09ba30de8e35417fad86cbe
2012-07-16 21:23:34 -07:00
Sreenidhi T
4bedba49fe Change done in BluetoothAdapter to use the same API for interacting with the Bluetooth Service. setName was being done using mService while getName was using mManagerService. As a result, the device name was not being updated in Localadapter getname call. Modified to use mService in both cases.
Change-Id: I2e900a782df11fd511319fbb42d94324e50ae89b
2012-07-16 21:22:32 -07:00
Kausik Sinnaswamy
a097f51e5f BT enable adapter API should return TRUE or FALSE.
Change-Id: Iaef14c51d3407b69505c55a0bbdaf902213402cf
2012-07-16 21:21:23 -07:00
fredc
0f42037eb7 Non persistent adapter service
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5

Conflicts:

	core/java/android/bluetooth/BluetoothInputDevice.java

Conflicts:

	core/java/com/android/internal/app/ShutdownThread.java
	services/java/com/android/server/SystemServer.java

Conflicts:

	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/pm/ShutdownThread.java
2012-07-16 21:20:54 -07:00
Ravi Nagarajan
919a4c6264 Handle cancel bond for both legacy and ssp pairing
Change-Id: I7a6db3cd7b5b8e72dca988e753dcba9a8df614c8
2012-07-16 21:20:29 -07:00
Priti Aghera
349e62f329 HID-PTS: Included apis' for pts tests
Change-Id: I7dc0a893ee86a2560c351a565bd170517f6c6079
2012-07-16 21:20:07 -07:00
fredc
4c9cacadcc Added support to get a remote device's service UUIDs
Change-Id: I9aa47ac2bb7377aca268e95fec31c518358b3065
2012-07-16 21:19:51 -07:00
Srikanth Uppala
827de2d73e Fix discoverability timeout issues. (a) implement timeout logic (b) persist 'never timeout' after reboot (c) code cleanup
Change-Id: Iacaec4a48a45935a49576c140ea11ea3d0da6361
2012-07-16 21:19:35 -07:00
zzy
3b147b7702 Added new rfcomm multi accept code 2012-07-16 21:19:18 -07:00
Matthew Xie
13450df2b9 Initial Health Profile implementation
Change-Id: I22f35073ceb131d84df6b233d1b63d20fa1b4451
2012-07-16 21:18:56 -07:00
Matthew Xie
bf246ef0ab Initial implementation of HID, add IBluetoothInputDevice idl
Change-Id: Iadc79a425b4b6e12329d86dd2ac0782adcb0174d
2012-07-16 21:18:36 -07:00
Priti Aghera
db44b20fe6 Added support to cancel pairing from UI while doing SSP.
The new code sends SSPReply with one of the arguments as false.
Signed-off-by: Priti Aghera <paghera@broadcom.com>
2012-07-16 21:18:08 -07:00
Matthew Xie
14b330d3a6 add queryPhoneState in IBluetoothHeadsetPhone
Change-Id: I10a9237518f04c1453d09f9a10b6ce0e6107056a
2012-07-16 21:17:41 -07:00
Matthew Xie
3e8c82edb1 Framework changes for HFP and A2DP profile implementation of the new stack.
Add IBluetoothHeadsetPhone.aidl for a small service in Phone to get
phone state changes

Change-Id: I1015e4a69720c4e9cd18ae4236ccd0dbff2e1b2c
2012-07-16 21:17:05 -07:00
Jaikumar Ganesh
e21a4ac09d Add a new version of the disable API.
This allows for the setting to be persisted or not.
Also turn on Bluetooth in System Server if needed.
It won't work currently because the service wouldn't have
started.

Change-Id: I15fa2bff93aa32134c1b565fcbe90ba68614b6a1
2012-07-16 21:14:15 -07:00
Jaikumar Ganesh
e4caddbb7a Changes for new Bluetooth APIs.
Changes to Bluetooth Adapter, Device and IBluetooth interfaces
for new Bluetooth APIs. Delete AudioGateway.

Change-Id: Ib51b31187eafde261441b9311b5e7e13c8bff82f
2012-07-13 22:22:51 -07:00
Jaikumar Ganesh
313a216709 Delete various Bluetooth files for stack integration. 2012-07-13 22:22:51 -07:00
Scott Main
adba6ffbb9 am 101a120c: am 9be0105f: docs: fix several links
* commit '101a120c27f68fb7d44e6221244cb9441dfc4285':
  docs: fix several links
2012-06-22 13:35:52 -07:00
Scott Main
9be0105fbc docs: fix several links
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
2012-06-22 12:35:08 -07:00
Wink Saville
bbf30dfd76 Enhance StateMachine Quitting and logging support.
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.


bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7
2012-05-29 12:40:46 -07:00
Jason Simmons
7a53510787 am 1903a732: Merge "Avoid calling BluetoothSocket.destroyNative twice" into ics-aah
* commit '1903a73248af260f4cbb5a9c65664f22c7f51c41':
  Avoid calling BluetoothSocket.destroyNative twice
2012-05-07 09:14:57 -07:00
Jason Simmons
34b2feb041 Avoid calling BluetoothSocket.destroyNative twice
If the destroyNative JNI method is called twice, it will attempt to free
the socketData twice, and the second free will cause an assertion failure.

To avoid this, check whether mSocketState has already been set to CLOSED
while holding the write lock.  If it has, then destroyNative has already
been called and should not be called again.

Bug: 3096033
Change-Id: Ic7c0bbf21823d389b26919da8c533d8ac4d49064
2012-05-03 19:46:01 -07:00
Martijn Coenen
6c614b7e59 Allow enabling Bluetooth without auto-connecting.
This is a feature used for NFC-to-Bluetooth handover:
we want to enable BT for file transfer, and disconnect
it when we're done. During this period we don't want
to auto-connect other devices - it should be transparent
to the user that Bluetooth is used. Also, don't allow
A2DP/HSP incoming connections.

Change-Id: I0a03e8084c439b1271b6a80f4d9da5aacfe19c45
2012-04-23 16:25:30 -07:00
Jeff Brown
5bbd4b4f5f Get alias for Bluetooth devices.
Bluetooth devices can be renamed by the user.  Make the
input system aware of the user-specified name and transparently
pass it down to applications.  This enables the keyboard
layout picker Settings UI to use device names that are
consistent with what the user set in the Bluetooth UI.

Bug: 6363157
Change-Id: I8eea26ce2c69c2a3f09c8de02e9e847610e0419c
2012-04-20 20:11:12 -07:00
Ken Wakasa
f76a50ce8f Fix obvious typos under frameworks/base/core
Change-Id: Ia5fc3db1bb51824e7523885553be926bcc42d736
2012-03-09 22:48:43 +09:00
Joe Fernandez
2b07267753 am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '201469f54522436be79d4d6665721049bfc74320':
  docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:59:34 -08:00
Joe Fernandez
3aef8e1d1b docs: Add developer guide cross-references, Project ACRE, round 4
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
2011-12-22 15:08:23 -08:00
Nick Pelly
75596b4545 Add BluetoothAdapter.getRemoteDevice(byte[])
This is useful for NFC->BT hand-over, where we are already working with bytes.

Change-Id: I2fff0b4fa0cefe9bfdf9a13f7ec6f557776a8a03
2011-12-09 14:35:38 -08:00
Jaikumar Ganesh
9bb275197d Cleanup references when turning BT off.
Bug: 5572649
Change-Id: I62f9e0620832b69995d5c6e1c24634c9a3895a4b
2011-11-28 16:19:36 -08:00
Matthew Xie
2b9af44e40 am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call
2011-11-17 13:10:14 -08:00
Matthew Xie
44b58ab89e Check the bluetooth state for getUuid call
Donnot make the bluetoothservice.getUuids call if the bluetooth
is not on. Also get rid of all the necessary locks on BluetoothService
for get property call. It had a lock on BluetoothAdapterProperty.
bug5472114

Change-Id: I383472ae6006fc1f0129c960c8a44ed0df027a43
2011-11-16 12:27:57 -08:00
Matthew Xie
98f06da8ed Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
Send CONNECT_OTHER_PROFILE to Device profile for low priority hfp and a2dp
incoming connect. In the case when HFP autoconnect is off but a2dp autoconnect
is on, if HF autoconnect to HFP, phone will reject HFP but connect a2dp.
Before this fix, phone reject HFP. A2dp will not get connected unless the HF do
media auto-connect, which most carkits do not do.
Also do similar change for incoming a2dp connection
bug 5091838

Change-Id: Ife1815f527bcd94e0d9ffc645028484fa9c49a43
2011-11-11 12:11:35 -08:00
Matthew Xie
ad2321027e Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
Give APP a way to find out if a service is supported by a remote device
bug 5487202

Change-Id: I5a2d050cf24d945e1c9875963c34177ed1ce773a
2011-11-08 11:58:12 -08:00
Ed Heyl
9d6a51623f Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
This reverts commit ae5839dcad.
2011-11-08 05:58:37 -08:00
Matthew Xie
67f1ceb616 Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-07 22:42:00 -08:00
Matthew Xie
ae5839dcad Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
Give APP a way to find out if a service is supported by a remote device
bug 5487202

Change-Id: Ie778b3227f29a24cdf61fa0365b82f9a45d439dc
2011-10-27 14:28:46 -07:00
Jaikumar Ganesh
6ae5912175 Fix auto connection of headset profile.
Sometimes when headset service doesn't get bound, the auto
connection fails.

Based on a patch by: Chunho Park <chun.ho.park@samsung.com>

Change-Id: Ia24613b47487717f51895953c7e8bc52abffecb5
2011-10-26 16:00:28 -07:00
Scott Main
2d68a6ba3c docs: mix of BT and NFC javadoc updates
Add Health profile to various discussions about profiles
Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links

Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
2011-09-27 14:04:48 -07:00
Jaikumar Ganesh
fd966a124f Make Bluetooth Health constant public.
Change-Id: I366f1231056fe978d85ee80c773d5911badb22e2
2011-09-21 16:03:42 -07:00