Andre Eisenbach
7518ade9f6
am cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit 'cd623416455100f64ef3f0be7ced27ffc04938a8':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:50:06 +00:00
Andre Eisenbach
cd62341645
am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit '8f31fa81e0a79f51ceb301193a2c77ca7f619769':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:42:55 +00:00
Andre Eisenbach
455502b750
Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
2015-02-10 00:21:43 +00:00
Matthew Xie
be96280fda
am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit 'a96869fc1323faa5989803c5235c4c28e1094a16':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 22:22:29 +00:00
Matthew Xie
a96869fc13
am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit '24c02c418673a18a287ce0820f0024f7a18ff181':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 22:14:10 +00:00
Andre Eisenbach
2b8696e3a9
Add API to check if a Bluetooth connection is encrypted (1/2)
...
Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
2015-02-09 11:31:06 -08:00
Matthew Xie
60675b2273
Separate the protection of mProxyServiceStateCallbacks from that of mService
...
The overuse of mManagerCallback caused a deaklock.
Bug: 19264190
Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
2015-02-06 14:13:56 -08:00
RoboErik
4197cb60bc
Move mute/unmute handling to adjust volume paths
...
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.
Also updates the hidden master versions of these APIs.
Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
2015-01-29 16:14:30 -08:00
Prerepa Viswanadham
543945669b
am 76552bb9: am e77adabe: Don\'t compute flags length for scan response
...
automerge: 34c32f4
2015-01-23 18:10:40 +00:00
Prerepa Viswanadham
34c32f4034
am 76552bb9: am e77adabe: Don\'t compute flags length for scan response
...
* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
Don't compute flags length for scan response
2015-01-23 18:01:54 +00:00
Prerepa Viswanadham
e77adabeaf
Don't compute flags length for scan response
...
Bug 19041626
Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
2015-01-23 17:51:43 +00:00
Andre Eisenbach
284e66e23c
am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev
...
automerge: 7ea97e2
2014-12-16 17:30:33 +00:00
Andre Eisenbach
7ea97e28e6
am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev
...
* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97':
Don't send the onServiceDisconnected callback after close.
2014-12-16 17:27:46 +00:00
Benjamin Franz
c88b6bdcfa
Don't send the onServiceDisconnected callback after close.
...
Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a
2014-12-16 15:33:03 +00:00
Andre Eisenbach
1ee272b064
am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393
...
* commit 'f60f29d060a538bd59b79ab8bd69ca6a31d26c29':
Prevent NullPointerException in getStringValue if no value is set
2014-12-10 21:57:40 +00:00
Andre Eisenbach
f60f29d060
am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
...
automerge: e832393
2014-12-10 18:49:41 +00:00
Andre Eisenbach
0fd06a19bd
Prevent NullPointerException in getStringValue if no value is set
...
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
2014-12-09 16:42:14 -08:00
Justin Harrison
04e8a5fb4c
am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
...
* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
Add UUID for Pbap client
2014-12-09 00:18:35 +00:00
Benjamin Franz
9c0e993d4e
am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
...
* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3':
Change the routing path of bluetooth headset connections.
2014-12-09 00:17:44 +00:00
Justin Harrison
e0b2fa5c57
am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
...
* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
Add UUID for Pbap client
2014-12-08 19:16:37 +00:00
Benjamin Franz
f4a76651b0
am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
...
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
Change the routing path of bluetooth headset connections.
2014-12-08 19:14:56 +00:00
Prerepa Viswanadham
fd5e847cb6
am 12120998: am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
* commit '12120998f8b34c809d8f29790a8f74e624b26e38':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-05 21:19:53 +00:00
Prerepa Viswanadham
12120998f8
am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
2014-12-05 20:18:38 +00:00
Justin Harrison
4a9cecb1f0
Merge "Add UUID for Pbap client" into lmp-mr1-dev
2014-12-05 19:41:55 +00:00
Benjamin Franz
fb967585cc
Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
2014-12-05 12:04:03 +00:00
Mike Lockwood
6d37adf83d
am a6e14c82: am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
...
* commit 'a6e14c8293ef470e29541500506de15d61ab6bf0':
Dont call close in in BluetoothA2dp finalize
2014-12-05 00:15:42 +00:00
Mike Lockwood
a6e14c8293
am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
...
* commit '75b2557725430e768cc3b21bb9c2aef92b887538':
Dont call close in in BluetoothA2dp finalize
2014-12-04 22:45:07 +00:00
Prerepa Viswanadham
ff5e5db319
Fix BT crash due to unset value for BluetoothGattDescriptor from API user
...
Validate writeDescriptor and writeCharacteristic methods at API invocation
for non null initialisation.
Bug 18395071
Change-Id: I411a57b77981310d8db1f98c67e03b4327c93339
2014-12-04 18:30:03 +00:00
Benjamin Franz
e8b98925d0
Change the routing path of bluetooth headset connections.
...
The HeadsetService is now bound directly by the BluetoothManagerService.
The IBinder object related to the HeadsetService is then given back to
the BluetoothHeadset and to the client app. This change makes the
HeadsetService available for managed profile clients.
Bug: 16968338
Change-Id: I016d1837e4f987c0fab1fc2c64cb06eb91b24d87
2014-12-04 16:57:25 +00:00
Andre Eisenbach
2b5f59d524
am b45c38ac: am fcb94852: am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev
...
* commit 'b45c38acc7c4ea0eaa79209e0d6de7c4f0f34c52':
Add server-side callback for change in MTU (4/4)
2014-12-02 08:24:19 +00:00
Andre Eisenbach
16bf846990
Add server-side callback for change in MTU (4/4)
...
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.
Bug: 18388114
Change-Id: I515bfc2cc9846490d57de71860f41ea9a61fa243
2014-11-26 12:58:44 -08:00
Matthew Xie
6862361b50
Add UUID for Pbap client
...
Bug: 18140961
Change-Id: I9cbeb7129b1d30aa7a195ed83821d4a5634283ed
2014-11-20 21:53:26 -08:00
Tom Turney
dfd827e424
am e9f8d1dd: am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisem
...
* commit 'e9f8d1ddbdfe6bf9d4b4a9cb1fca8703febff742':
Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes.
2014-11-15 03:38:12 +00:00
Tom Turney
29230ceab9
Feature request: Increasing advertise data size on
...
non-connectable adv.
When the advertisement is non-connectable, give back the
bytes to the advertiser where the adv flags would have been.
This increases the non-connectable advertisement's advertise
data from 24 to 27 bytes.
Bug:18359570
Change-Id: Ia3cc48dca50cc3c51095ee92a489f143f6d350b1
2014-11-15 02:25:05 +00:00
Mike Lockwood
7c2b60ed37
am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5
...
automerge: 5a880e72
2014-11-08 03:09:13 +00:00
Mike Lockwood
95c05a590f
Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
2014-11-08 02:15:28 +00:00
Mathias Jeppsson
2d2d8c2854
Dont call close in in BluetoothA2dp finalize
...
The close in finalize() is pointless, as finalize() will only be called
if there are no references to BluetoothA2dp. Until close() is called,
BluetoothManagerService will have a reference to BluetoothA2dp,
preventing garbage collection and finalize() to be called. This means
finalize() is not serving its purpose of cleaning up in cases close()
is not called, as finalize() is only called if close() has already
been called.
Actually calling close in finalize here means unregistering the already
unregistered mBluetoothStateChangeCallback which can lead to crashes
when pairing/unpairing BTH. A typical crash would look like:
*** FATAL EXCEPTION IN SYSTEM PROCESS: BluetoothManager
java.lang.NullPointerException
at android.os.RemoteCallbackList.unregister(RemoteCallbackList.java:143)
at com.android.server.BluetoothManagerService$BluetoothHandler.handleMessage(BluetoothManagerService.java:780)
at android.os.Handler.dispatchMessage(Handler.java:99)
Change-Id: Ib65962917ecbacf7900d7fe540057e6915f0532d
2014-11-07 07:02:50 +00:00
Mike Lockwood
ddbfc9ada1
Add BluetoothDevice field to BluetoothHeadsetClientCall
...
Change-Id: I9bc70eb289fdfb64e315e3508ddeef1cb009cc54
2014-11-04 11:37:24 -08:00
Andre Eisenbach
178d3b54cd
Fix crash during Bluetooth on/off stress test
...
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
2014-10-29 12:13:38 -07:00
Mike Lockwood
726d4de780
Add dumpsys support for bluetooth
...
Bug: 18159457
Change-Id: I8d3f7084a7b089c111fd622ff526630bfdfa7300
2014-10-28 14:06:28 -07:00
Wei Wang
020bd7b861
Remove spammy log information for BLE scan.
...
Bug:17574681
Change-Id: Ic5761ad7262200f38f2b67659c37f8a3f01d80d5
2014-10-18 00:29:57 +00:00
Prerepa Viswanadham
56302744c4
am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 16:11:26 +00:00
Prerepa Viswanadham
248edc3e96
Update javadoc comments for getBluetoothLeAdvertiser()
...
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities
bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
2014-10-16 16:06:44 +00:00
Wei Wang
35cd4c853f
Add support of advertising through standard instance.(1/4)
...
Use config overlay to check whether peripheral mode is supported.
Bug: 17552672
Change-Id: I1081bc84da9fe033426f82ece2ec74c2d663e3aa
2014-10-09 18:01:39 +00:00
Prerepa Viswanadham
f0b56a5a7f
Remove remanents of onConnectionCongested in framwork
...
Bug:17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
2014-09-24 22:15:08 +00:00
Edward Jee
1bbfcc2fdc
Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev
2014-09-16 01:19:19 +00:00
Prerepa Viswanadham
ba4f57a1c6
Remove onConnectionCongested callback
...
Bug:17289507
Change-Id: I49fd99d320084c618dcec756b832fb3b6a6aec51
2014-09-11 22:29:27 +00:00
Edward Jee
8dd30aadaf
Adds APIs for Bluetooth PBAP and MAP access permission.
...
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.
However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.
Bug: 17158953
Change-Id: I3771f03eaea3f57cf60d93ab9fd41c9eb3e1e99c
2014-09-09 15:10:01 -07:00
Wei Wang
6550557f99
Merge "Unregister app when advertise failed after registration." into lmp-dev
2014-09-05 18:49:27 +00:00
Matthew Xie
726652e9d3
Close the base socket when bindListen fails
...
Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2
2014-09-03 19:25:39 +00:00
