Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,926 Commits 3 Branches 0 Tags
b59dcfd5e108fdffbc610ef109cccecbbd11cd75
Commit Graph

324 Commits

Author SHA1 Message Date
Matthew Xie
7f3c5d164f Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 2013-04-26 01:18:34 +00:00
Matthew Xie
d575233c53 Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN 
bug 8667898

Change-Id: Iaff19fe72b16a96a6cf2f5b9140e369098567d2b
 2013-04-24 17:51:37 -07:00
zzy
71bfafc84a Added flush() for bluetooth output stream 
Bug 8498784

Zebra QL420 Plus Bluetooth printer fails on Android 4.2.2
 2013-04-24 00:24:34 -07:00
Matthew Xie
cdd94e3647 Remove BluetoothAdapterCallback. Simplify leScan Api 
App does not need to explicitly register/unregister callback
bug 8599881

Change-Id: I18cfef14d7ddb344722945e657dcb959823b412b
 2013-04-17 20:49:33 -07:00
Andre Eisenbach
3b64f38a16 Make BluetoothGattServer.close() public 
This functino is needed for applications to un-register from the
Bluetooth stack.
bug 8591003

Change-Id: Id05f592245d1d90791d34c3617aadac67bc6502c
 2013-04-10 19:13:10 -07:00
Matthew Xie
26cd4d658f Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev 2013-04-04 03:16:40 +00:00
Matthew Xie
33ec9840c7 Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt 
Change name of BluetoothDevice#connectGattServer to BluetoothDevice#connectGatt
Add BluetoothGatt#getDevice to retrieve device from BluetoothGatt
Add BluetoothGatt#connect() to reconnect back to the server.
Make BluetoothGatt#close() public to clean up/unregister callback
Add BluetoothDevice.getType() to return int of
bug 8529188

Change-Id: Iebd9ac68cc7a64c43972e617dd3068f66c8ea0b2
 2013-04-03 18:20:13 -07:00
Andre Eisenbach
6f0ed128e4 Fix minor LE descriptor permissions issue 
Change-Id: Idded482a08f17a1373adf3e3a51709ff585d4f24
 2013-04-03 14:54:12 -07:00
Matthew Xie
84e594f7db Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev 2013-03-28 23:04:48 +00:00
Matthew Xie
ddf7e4756c Unhide Bluetooth Low Energy public APIs 
Updated API headers. Add BluetoothManager to be retrieved by
context.getSystemService(Context.BLUETOOTH_SERVICE).
LE scan functions are placed in BluetoothAdapter
The GATT API are device driven instead of a profile-driver.
bug 8450158

Change-Id: I424a4cedaac3ef8120a05996500008dd210d2553
 2013-03-28 15:36:10 -07:00
Elliott Hughes
94eaab4a5d am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]" 
* commit '3ae30483777708ff3a4f59a4fa75c6a76213cc30':
  Correct executable bit for source files [Take 2]
 2013-03-28 14:29:21 -07:00
Robert Greenwalt
665e1aed5e Add BT - DataTracker connection 
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
 2013-03-27 15:45:12 -07:00
Chirayu Desai
3e4a3ea2ff Correct executable bit for source files [Take 2] 
Change Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 left out some
files, this fixes them.

Change-Id: Ia949a8581668836ea0251602e048f09c852f5169
 2013-03-27 16:52:35 +05:30
Lorenzo Colitti
69edd64d9b Add stacking to the NetworkStateTrackers. 
Bug: 8276725
Change-Id: I55a107fea78f9cc84f15bd6c75292138fb35a1b6
 2013-03-15 14:35:35 +09:00
Andre Eisenbach
3f36660a60 Fixed 32 bit characteristic value assignment 
Also fixed link in comment.

Change-Id: I27223b8aadae2fc7c8037abc6396760e23f6f161
 2013-03-12 10:53:56 -07:00
Stephen Hines
41cf8f354f Fix docs bug. 
Change-Id: I8c69963b339d703757bf1cd8f43161175783566d
 2013-02-28 14:23:00 -08:00
Ganesh Ganapathi Batta
9908112fd0 Initial version of BLE support for Bluedroid 
The API classes are hidden for now. Will unhide after API console
approval.
Change-Id: I8283dd562fd6189fdd15c866ef2efb8bbdbc4109
 2013-02-27 18:08:14 -08:00
Matthew Xie
90bd55f179 am 3b5c4382: am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev 
* commit '3b5c43825eaf8096c01eac77e03a8aac8e9fab4a':
  Clean up debug messages
 2012-12-03 11:30:56 -08:00
Matthew Xie
d77982ef29 Clean up debug messages 
bug 7626174

Change-Id: I65cdcaf2c48a78468b6cef0b8591289435068b24
 2012-11-29 20:26:19 -08:00
zzy
0a3b9017ed am de95a276: am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size 
* commit 'de95a276e7caf3b9918c21a4f43f91c7c25b3a6b':
  timeout support for accept() and added check for signal size
 2012-11-29 14:33:14 -08:00
zzy
652678af4d timeout support for accept() and added check for signal size 
bug 7592240

Change-Id: Ide1868da669c190cdfed90f7af3f739ec9da690b
 2012-11-28 22:12:27 -08:00
Robert Greenwalt
4717c261b2 Remove DhcpInfoInternal 
First step in accepting a set of patches.
bug:6799630

Change-Id: I6c894c60aeb3022960c2aaa45451bb1dde2b493b
 2012-11-09 09:46:32 -08:00
Zhihai Xu
fa0fd39a4b License of files Bluetooth package is not updated to ASL2 
bug 7385618

Change-Id: I6232f537f4fda979d3aabe3a059c11d3299de9b8
 2012-10-23 17:31:56 -07:00
zzy
b49a896359 Add serial port profile support and allow to connect to rfcomm channel without sdp discovery 
bug 7272974

Change-Id: Idc10edc056b48da2fd96bea84eba3fb73b97bab1
 2012-10-15 22:30:29 -07:00
Matthew Xie
563e414784 Reduce android.bluetooth package debug messages 
bug 7174712

Change-Id: I8d3fdc8edbe42068b5a550660d7b24854c3c4af4
 2012-10-09 22:10:37 -07:00
Matthew Xie
9e3045c75c Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 2012-08-29 16:30:14 -07:00
Matthew Xie
3b6214f373 Turn off verbose debug message in BluetoothAdapter 
Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
 2012-08-29 15:47:41 -07:00
Irfan Sheriff
da6da0907b Captive portal handling 
We now notify the user of a captive portal before switching to the network as default.
This allows background applications to continue to work until the user confirms he
wants to sign in to the captive portal.

Also, moved out captive portal handling out of wifi as a seperate component.

Change-Id: I7c7507481967e33a1afad0b4961688bd192f0d31
 2012-08-27 22:27:06 -07:00
Ganesh Ganapathi Batta
fffa86ba83 Implement enableNoAutoconnect() 
Adding enableNoAutoconnect() API support in Bluetooth service
 to let BT enable in quiet mode

Change-Id: I546f3ceb298082a9c9a698f406379470e3cc0d4f
 2012-08-14 00:18:07 -07:00
Ganesh Ganapathi Batta
6f6c54519a Auto connection/disconnection related changes 
Remove ACTION_CONNECT_OTHER_PROFILES as it is no longer used
Allow only PRIORITY_ON and PRIORTY_OFF  as priority params for SetPriority()
API in BluetoothA2DP and BluetoothHeadset
BluetoothPBAP: Pass on proxy object as part of Service Connected callback

Change-Id: Ida00fc2b7d1dcb91b01f7ddd2cea482367a3b334
 2012-08-06 23:24:26 -07:00
Martijn Coenen
10d7e8afb2 Bluetooth: fix enableNoAutoConnect() call. 
For now, just do a regular connect.

Change-Id: Ibc43098d45c82177298cb17d72a32c7904924021
 2012-08-03 08:36:02 -07:00
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