Commit Graph

390 Commits

Author SHA1 Message Date
Ariel Gertzenstein
a2d8706ca8 DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
2014-04-21 14:26:56 -04:00
Andre Eisenbach
cc68cc962d LE: Return false if an attribute read/write is in progress
bug:12109128
Change-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187
2014-04-09 10:59:44 -07:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
Wei Wang
f3f52b1b4c Add comment of using same callback for start/stop advertising.
Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
2014-03-27 19:34:46 -07:00
Andre Eisenbach
580b0a1302 LE: Add API to configure MTU for a given connection (3/4)
bug:13571470
Change-Id: I3619617eaf864701a35f7802bc71805784d768d0
2014-03-25 18:02:06 -07:00
Wei Wang
32779536bc am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
* commit '13bd85772f6279d14303ec3a18615613c3722844':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
2014-03-20 16:59:13 +00:00
Wei Wang
13bd85772f am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
* commit 'c0384b6b18617cc395814c5b20077955a185e392':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
2014-03-20 03:41:47 +00:00
Wei Wang
d10bc171a5 am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '15a18d07acc57d465e9d67bb28010912bb9ad15f':
  DO NOT MERGE:  Add status callback for start/stop advertising.
2014-03-20 03:36:45 +00:00
Wei Wang
15a18d07ac am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit 'da084104eb768f4472b7988b77a4f2b7e3f170d8':
  DO NOT MERGE:  Add status callback for start/stop advertising.
2014-03-20 03:32:17 +00:00
Wei Wang
c0384b6b18 DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050
Cherrypick from master to fix b/13289050

Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
2014-03-19 20:31:36 -07:00
Wei Wang
4b4eebb9a5 DO NOT MERGE: Add status callback for start/stop advertising.
Cherrypick from master to fix b/13289050

Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java
2014-03-20 00:33:41 +00:00
Wei Wang
0ea81eed88 am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '1327e59f36ceea5a1ee7dc66b311206345353de5':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
2014-03-08 02:05:57 +00:00
Wei Wang
ee0b3e9f82 DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Add bluetooth adv data, APIs in BluetoothAdpater etc.

Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
2014-03-06 18:45:17 +00:00
Mike J. Chen
8faffa400b Add handshake broadcast support
Also make a log message verbose only.

Change-Id: I805ca376c0c0c37ec67897e5473a78fc943fdc63
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-03-04 17:27:16 -08:00
Mike J. Chen
d96d5cfffc BluetoothInputJava: Add broadcast action REPORT
It's returned by getReport() when callback data is ready.

Change-Id: I751c9e31de3d82a454a62cb8485a230e722b740d
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-01-27 17:55:40 -08:00
Mike J. Chen
1b47f7cc1a BluetoothInputDevice: make REPORT_TYPE values match hal
So we don't have to do conversion when using getReport/setReport
and can pass the value to the BT HAL directly.

Change-Id: I8d4af72d2e040d43cc9ff8a8cddfbe6cc8cfdb9a
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-01-27 16:27:04 -08:00
Wei Wang
86b3fa6090 BLE peripheral mode (3/4): Add peripheral mode API.
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
2014-01-13 17:53:48 -08:00
Zhihai Xu
82e95573c7 NPE in BluetoothSocket.write()
If calling connect succeed, we should not see this NPE.
An IOException may happen after call BluetoothSocket.connect.
If you still call write after the IOException,
you will get this NPE.
add NPE protection for possible wrong calling sequence from application,
To make bluetoothSocket more error-tolerant.

bug:12104154
Change-Id: I7fa4e847b500ca9b9d2a43df432f31a1bb016c0a
2014-01-13 17:52:13 -08:00
Katie McCormick
f2041ac56e Doc update: Update package summary for BT.
Fixes:

b/8584860

Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14
2013-12-12 15:42:00 -08:00
Matthew Xie
ac2c6c3a16 Change pairing api/intent permission from PRIVILEGED to ADMIN
The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug 11101076

Change-Id: I3a314efd973b3ce078ab5347159c336f222d9f15
2013-10-21 14:56:33 -07:00
Matthew Xie
64be26fad7 Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev 2013-10-10 21:56:20 +00:00
Matthew Xie
9b69399399 Check callback null condition for register/unregsiter state change callback
Fix BluetoothPan closing sequence for unregsiter state change callback
bug 11160007

Change-Id: I405ec91a938289fe9541de2ebd9abc1fb938f44a
2013-10-10 12:12:04 -07:00
Edward Jee
430e361b20 Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED.
Bug: 11087521
Change-Id: I99cc584987bf12fe0648b048398b4eb9836e6172
2013-10-10 18:42:34 +00:00
Mike Lockwood
68c692df5f Revert "Allow L2CAP sockets"
This reverts commit 34b0f92613.
2013-10-02 07:56:46 -07:00
Matthew Xie
091fc2ba7a Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields
bug 9987787

Change-Id: Id1c149964137e35703310e2f2893c8830aacddea
2013-09-29 13:17:56 -07:00
Kim Schulz
0d37605374 Fixed review comments
- fixed review comments (internal+google)
- corrected tabs/spaces
- Add connection id header for obex client operations
- added support for implementing ProfileService class

Change-Id: Idab8b4fa54a0f31bec4ffa263a69a9850a07f858

Bug:10692365
2013-09-12 19:07:28 -07:00
Dmitry Grinberg
34b0f92613 Allow L2CAP sockets
Change-Id: Icb498e6c0430789b6168bec3beb1d4650e4f1238
2013-09-06 12:27:12 -07:00
Matthew Xie
02a25a97a2 Merge "Block ble adv api based on resource config" into klp-dev 2013-09-03 22:36:09 +00:00
Matthew Xie
c5470778a4 Block ble adv api based on resource config
bug 10516911

Change-Id: I7a62103a1116ffbf7c3c934c1794384c0e6fbdd3
2013-08-28 15:45:23 -07:00
Ying Wang
b240578f03 Fix docs build.
Change-Id: I7bfcfea052de6959230bb361400e760eab35b78c
2013-08-26 17:48:22 -07:00
Edward Jee
922d41b6ef Enables AT+ANDROID command in Bluetooth HFP.
Adds another vendor-specific command AT+ANDROID in Bluetooth Hands-Free
Profile. And creates an API function that sends an unsolicited result
code +ANDROID .

Bug: 8736189
Change-Id: I4757c410d31b97511c92f66d71035eb929f9fd29
2013-08-23 01:17:07 +00:00
Vinit Deshapnde
e2a6d3df12 Merge "Introduce network link quality statistics" into klp-dev 2013-08-22 16:16:45 +00:00
Vinit Deshapnde
1f12cb52a4 Introduce network link quality statistics
This change starts tracking traffic quality data for WiFi and mobile
networks. The quality is tracked based on incidental traffic, and not
on specific measurements. Theoretical bandwidths are hard-coded, as
well as sampling interval; although sampling interval can be changed
by setting a system policy.

Bugs filed to remove shortcomings of this change -

10342372 Change LinkInfo name to something better
10342318 Move hardcoded values of MobileLinkInfo to resources
         so they can be updated without changing code

Bug: 10006249

Change-Id: I83d8c7594da20fe53abbd5e1f909b1f606b035bb
2013-08-21 13:09:01 -07:00
John Du
b7b7d7a05c Update comments
bug 10152994

Change-Id: I05bbd917ebd0d140e0894f8bf7e43d0fc77378c8
2013-08-20 14:03:28 -07:00
John Du
48f8b5dbf6 Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()
BluetoothGatt.abortReliableWrite() should not take a BluetoothDevice
parameter. Instead, it should use mDevice instance variable.
bug 10152994

Change-Id: I7fc79b9011cf878414128cc9f1696e5ccc597056
2013-08-19 16:01:24 -07:00
John Du
5a0cf7a27f Adding support for Absolute Volume
Change-Id: I7bbc6f9296221ca219a50a5e377ebac9dcf5a407
2013-08-16 12:25:20 -07:00
Andre Eisenbach
c60bed487e LE: Add support for the HID-over-GATT profile (2/3)
bug:8330048
Change-Id: I600563d81dec1638dc35e31e19f61d6c04f09ae8
2013-08-15 15:01:10 -07:00
Matthew Xie
a5c81e8636 Merge "LE: Add peripheral role support (1/4)" into klp-dev 2013-08-14 08:14:09 +00:00
Andre Eisenbach
f46b21aa99 LE: Add peripheral role support (1/4)
Initial stack support for the LE peripheral role.

Change-Id: I6222493488822b4289b90888ccc97ad9306f54d1
2013-08-14 00:48:24 -07:00
Matthew Xie
08c34c326f Merge "LE: Add instance ID to descriptors (1/4)" into klp-dev 2013-08-14 07:27:49 +00:00
Andre Eisenbach
25b9cf953b LE: Add instance ID to descriptors (1/4)
If a remote devices offers multiple descriptors with the same UUID, the
instance ID is used to differentiate between them.

Change-Id: I0c36494c980c86abd23f9647196af8d59ef663e9
2013-08-13 19:25:05 -07:00
Matthew Xie
fe3807a5b2 Bluetooth MAP profile - sms and mms support initial check-in
bug:10116530

Change-Id: I57d022005bcff5bc3e56438a81ac92566f957744
2013-08-09 15:01:07 -07:00
Wink Saville
89d16f7597 am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '9b7b4450185e723dc7021f7e8bae4a12d4dd5606':
  If in a mobile captive portal is detected enable fail fast.
2013-08-08 17:10:34 -07:00
Wink Saville
d747cbc898 If in a mobile captive portal is detected enable fail fast.
When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.

Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
2013-08-07 16:22:47 -07:00
Dianne Hackborn
221ea892dc Start restricting service calls with implicit intents.
The bindService() and startService() calls have always had
undefined behavior when used with an implicit Intent and there
are multiple matching services.  Because of this, it is not
safe for applications to use such Intents when interacting with
services, yet the platform would merrily go about doing... something.

In KLP I want to cause this case to be invalid, resulting in
an exception thrown back to the app.  Unfortunately there are
lots of (scary) things relying on this behavior, so we can't
immediately turn it into an exception, even one qualified by the
caller's target SDK version.

In this change, we start loggin a WTF when such a call happens,
and clean up some stuff in Bluetooth that was doing this behavior.

Change-Id: I62e25d07890588d2362104e20b054aebb6c0e007
2013-08-05 16:53:26 -07:00
Zhihai Xu
876d100f02 Merge "Add debug menu to enable btsnoop" 2013-07-26 18:33:43 +00:00
Zhihai Xu
560a523159 Revert "Bluetooth stopped working in master - "bad file descriptor""
This reverts commit df3cedab6f.

Change-Id: I9ffaf5580924c150145d37ec38ffde602199b7e2
2013-07-26 18:10:06 +00:00
Zhihai Xu
df3cedab6f Bluetooth stopped working in master - "bad file descriptor"
ignore IllegalArgumentException in BluetoothSocket.close().

bug: 9960585
Change-Id: I301aa388b738dcb92b643fdd96b5c9cb6f8b3efe
2013-07-24 15:09:45 -07:00
kmccormick
00c5620acf am 30c8973f: am 75c59fb9: am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev
* commit '30c8973f66ad035a1734c8e53173b58ac1fbd32d':
  Doc change: new Bluetooth LE doc
2013-06-21 16:34:40 -07:00