Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,193 Commits 3 Branches 0 Tags
305efe23a326d0f886d3cf66ea05dfbd30e714e2
Commit Graph

307 Commits

Author SHA1 Message Date
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
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