OSDN Git Service
Miao Chou [Wed, 29 Jul 2015 21:12:11 +0000 (14:12 -0700)]
Post-merged fix on "resolved conflicts for merge of
f993a9c4 to mnc-dr-dev-plus-aosp"
Change-Id: Ia45ab5a0b5f4fac85db5a8c91980077b50b76513
Andre Eisenbach [Wed, 29 Jul 2015 20:14:20 +0000 (20:14 +0000)]
am
9a53a81b: am
e1fe0e08: am
b61d25c5: Fix memory leak in A2DP event handler
* commit '
9a53a81bf25aa7cbbce21581cc6c1d9dbe8a8f7c':
Fix memory leak in A2DP event handler
Andre Eisenbach [Wed, 29 Jul 2015 19:48:17 +0000 (19:48 +0000)]
am
e1fe0e08: am
b61d25c5: Fix memory leak in A2DP event handler
* commit '
e1fe0e08d6385529b88192827ee4b9d76d462e94':
Fix memory leak in A2DP event handler
Andre Eisenbach [Wed, 29 Jul 2015 19:37:57 +0000 (19:37 +0000)]
am
b61d25c5: Fix memory leak in A2DP event handler
* commit '
b61d25c52fcfa1853c7555acda61d848ef6be3e9':
Fix memory leak in A2DP event handler
Andre Eisenbach [Wed, 29 Jul 2015 18:57:50 +0000 (11:57 -0700)]
Fix memory leak in A2DP event handler
btif_av_event_free_data() was not called in all states (idle state only)
leading to potential memory leaks.
Bug:
22822688
Change-Id: I40520c605c9a806e6cd5ee6e36c101d0aa8d4355
Nitin Arora [Wed, 29 Jul 2015 10:46:50 +0000 (10:46 +0000)]
am
7ffb0f1a: am
dbb1ad17: am
82c8b927: Reset LE encryption key size at LE disconnection only
* commit '
7ffb0f1af6d0a26aec4c0b4b943131c093ca4107':
Reset LE encryption key size at LE disconnection only
Nitin Arora [Wed, 29 Jul 2015 10:06:19 +0000 (10:06 +0000)]
am
dbb1ad17: am
82c8b927: Reset LE encryption key size at LE disconnection only
* commit '
dbb1ad17bae0fa3d0dc12795a73ea4a705e220ba':
Reset LE encryption key size at LE disconnection only
Nitin Arora [Wed, 29 Jul 2015 08:15:32 +0000 (08:15 +0000)]
am
82c8b927: Reset LE encryption key size at LE disconnection only
* commit '
82c8b9270ba962d5f271a833a3454baddbc063aa':
Reset LE encryption key size at LE disconnection only
Anubhav Gupta [Wed, 29 Jul 2015 08:11:55 +0000 (08:11 +0000)]
am
909221f1: am
c3f8ba8a: am
dab356e3: Promote AVCTP version to 1.4
* commit '
909221f185518946481ec841863448c89e1cfc1d':
Promote AVCTP version to 1.4
Nitin Arora [Thu, 2 Jul 2015 21:08:39 +0000 (14:08 -0700)]
Reset LE encryption key size at LE disconnection only
This change checks the transport type on receiving the disconnection
and resets the encryption key size only if the LE disconnection
has taken place.
This fixes the issue where read request to characteristics that
require encryption, fails after cross key derivation due to
disconnection of BR/EDR transport.
Bug:
22515016
Change-Id: If6aad91a628eabbb5a4b7f5c22812fe94d4c5db2
Anubhav Gupta [Wed, 29 Jul 2015 07:31:43 +0000 (07:31 +0000)]
am
c3f8ba8a: am
dab356e3: Promote AVCTP version to 1.4
* commit '
c3f8ba8a309a4b967e17c6398213e2b6aedbfc80':
Promote AVCTP version to 1.4
Anubhav Gupta [Wed, 29 Jul 2015 07:12:35 +0000 (07:12 +0000)]
am
dab356e3: Promote AVCTP version to 1.4
* commit '
dab356e3b0573303840e63cbafb1065d57a11e2c':
Promote AVCTP version to 1.4
Anubhav Gupta [Tue, 28 Jul 2015 06:32:57 +0000 (12:02 +0530)]
Promote AVCTP version to 1.4
Promoting AVCTP version to 1.4 from 1.2 as Bluedroid stack
already has got support for the same.
Below changes are incorporated as part of this:
- AVCTP version in SDP entry is upgraded to 1.4 for both AVRCP
Target and controller role.
- Service class #1 is added in extra for AVRCP Controller SDP
entry to be in sync with AVCTP version change.
- Browsing support is not enabled as that needs corresponding
profile level implementation, which is currently unavailable.
Change-Id: I72f7f67eb0a789fd321e9468f2a51bb5e9385a89
Miao Chou [Wed, 29 Jul 2015 06:51:13 +0000 (23:51 -0700)]
resolved conflicts for merge of
f993a9c4 to mnc-dr-dev-plus-aosp
Change-Id: I10f47626ef8dcba857a36c93b8b5b4071511fc7b
Arman Uguray [Wed, 29 Jul 2015 00:19:18 +0000 (00:19 +0000)]
am
1b3a3d82: Add GN files for vendor_libs
* commit '
1b3a3d82840fd39e8b43e7cc761155dd1abeb417':
Add GN files for vendor_libs
Miao-chen Chou [Tue, 28 Jul 2015 23:55:28 +0000 (23:55 +0000)]
Merge "build: Eliminate cutils/str_parms dependency from system/bt"
Arman Uguray [Tue, 28 Jul 2015 01:32:05 +0000 (18:32 -0700)]
Add GN files for vendor_libs
Added BUILD.gn files for vendor_libs and vendor_libs/linux.
Bug:
21585592
Change-Id: I33f98421a94a4b4f530e48c94711775d776d02d7
Miao Chou [Wed, 8 Jul 2015 21:50:32 +0000 (14:50 -0700)]
build: Eliminate cutils/str_parms dependency from system/bt
Eliminate cutils/str_parmss dependency from system/bt by adding osi_str_parms:
- Added hash_map_utils which implements partial functions of cutils/str_parms
and uses osi/hash_map instead of cutils/hashmap.
- Updated osi/Android.mk, osi/BUILD.gn and the includes in audio_a2dp to use
osi_str_parms.
- Added unittest for hash_map_utils.
Bug:
21957864
Change-Id: I8458d9e45df6cab2b71840d24d17b9d75de9842c
Anubhav Gupta [Tue, 28 Jul 2015 19:19:22 +0000 (19:19 +0000)]
am
09243e65: am
92339316: am
2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets
* commit '
09243e65a2d6f3150d23963cd2707e702fac7023':
Fix a bug allocating buffers for fragmented AVRC packets
Anubhav Gupta [Tue, 28 Jul 2015 18:31:38 +0000 (18:31 +0000)]
am
92339316: am
2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets
* commit '
92339316ba8c56354f0b22aa966bfd60772caa23':
Fix a bug allocating buffers for fragmented AVRC packets
Anubhav Gupta [Tue, 28 Jul 2015 18:08:54 +0000 (18:08 +0000)]
am
2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets
* commit '
2ac9ae06be5091f6f2eef0022a3810752f127d04':
Fix a bug allocating buffers for fragmented AVRC packets
Anubhav Gupta [Fri, 24 Jul 2015 17:14:00 +0000 (10:14 -0700)]
Fix a bug allocating buffers for fragmented AVRC packets
Use the correct offset_len when allocating buffers for AVRC
packets that need to be fragmented.
Bug:
22156175
Change-Id: I7db12474c84edacb4f0739d50a43e8cebdcca676
Amirhossein Simjour [Tue, 28 Jul 2015 00:00:36 +0000 (00:00 +0000)]
am
f9fa3b1e: am
aeef91cb: am
1500b8d9: Fix for uhid_event size check
* commit '
f9fa3b1e28d3c0bc7a56a23f511bf70702bbdd13':
Fix for uhid_event size check
Amirhossein Simjour [Mon, 27 Jul 2015 23:33:52 +0000 (23:33 +0000)]
am
aeef91cb: am
1500b8d9: Fix for uhid_event size check
* commit '
aeef91cb76eaa66199c005e548be6787be762d00':
Fix for uhid_event size check
Amirhossein Simjour [Mon, 27 Jul 2015 23:21:16 +0000 (23:21 +0000)]
am
1500b8d9: Fix for uhid_event size check
* commit '
1500b8d9b301d8d68b2910692ec47d0e5b42c129':
Fix for uhid_event size check
Amirhossein Simjour [Mon, 20 Jul 2015 18:29:19 +0000 (14:29 -0400)]
Fix for uhid_event size check
The uhid_event function used to expect that the return value of each
read function call to match with the size of the struct uhid_event.
Since the header file doesn't match the kernel driver, these two size
don't always match. The exact size check is replaced with expecting
the minimum required size.
Bug:
20108348
Change-Id: Ib61537092b109296f8290d802b68fc2efe78888c
Christopher Wiley [Mon, 27 Jul 2015 18:50:35 +0000 (18:50 +0000)]
am
fbbd2259: Only build bt_service_unittests for linux
* commit '
fbbd225943c1e97074c61942d3fa29ae8c5fe202':
Only build bt_service_unittests for linux
Casper Bonde [Mon, 27 Jul 2015 18:42:45 +0000 (18:42 +0000)]
am
7be593c0: am
62cfbb3a: am
760aa99b: Unpair HID device cleanup
* commit '
7be593c004e4b0360bcadaf866c4bd986aeda05a':
Unpair HID device cleanup
Pavlin Radoslavov [Mon, 27 Jul 2015 18:42:44 +0000 (18:42 +0000)]
am
dab35012: am
191e588b: am
c6137426: Fix the logic for stopping the Power Management timers.
* commit '
dab35012ae9303d11cc020f85bcf6b4f332c2b05':
Fix the logic for stopping the Power Management timers.
Casper Bonde [Mon, 27 Jul 2015 18:18:50 +0000 (18:18 +0000)]
am
62cfbb3a: am
760aa99b: Unpair HID device cleanup
* commit '
62cfbb3a13ad30b4043583a6bff901fb4599b19a':
Unpair HID device cleanup
Pavlin Radoslavov [Mon, 27 Jul 2015 18:18:48 +0000 (18:18 +0000)]
am
191e588b: am
c6137426: Fix the logic for stopping the Power Management timers.
* commit '
191e588b5fcd026066049fdda65a4ae49c3d685c':
Fix the logic for stopping the Power Management timers.
Casper Bonde [Mon, 27 Jul 2015 18:05:45 +0000 (18:05 +0000)]
am
760aa99b: Unpair HID device cleanup
* commit '
760aa99b0f1fb7830dd5ff23ec8f5c5630b15989':
Unpair HID device cleanup
Pavlin Radoslavov [Mon, 27 Jul 2015 18:05:44 +0000 (18:05 +0000)]
am
c6137426: Fix the logic for stopping the Power Management timers.
* commit '
c6137426081fc55d8c94cd0e6b55cd0d0a52f12d':
Fix the logic for stopping the Power Management timers.
Casper Bonde [Fri, 3 Oct 2014 08:01:36 +0000 (10:01 +0200)]
Unpair HID device cleanup
When unparing HID devices, the attr_mask was not cleared.
By not clearing this data, some HID device will never be able
to connect again. (E.g. the Apple Magic Mouse)
Bug:
15566403
Change-Id: Ic80909dcecdf48d967c1a936b31554653761fa42
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Pavlin Radoslavov [Sat, 25 Jul 2015 06:41:55 +0000 (23:41 -0700)]
Fix the logic for stopping the Power Management timers.
Previously, the logic for stopping the timers didn't take
into account whether each timer was already running.
Bug:
22666419
Change-Id: Ia99bf8be917e9ea69f478a954085336fc899040a
Christopher Wiley [Mon, 27 Jul 2015 00:31:00 +0000 (17:31 -0700)]
Only build bt_service_unittests for linux
libchrome-host doesn't build on Mac, and while we get that sorted out,
let us not try and build this for Mac either.
Change-Id: I01d27391539d5c345d29a4ce949d0c3bcc931a7f
Samuel Ortiz [Sat, 25 Jul 2015 05:27:26 +0000 (05:27 +0000)]
am
081cba03: Add HCI user channel based bluedroid vendor adaptation
* commit '
081cba0366ab5dfa11e68676ff5282a8e20e68f0':
Add HCI user channel based bluedroid vendor adaptation
Samuel Ortiz [Fri, 24 Jul 2015 21:05:27 +0000 (14:05 -0700)]
Add HCI user channel based bluedroid vendor adaptation
This libbt vendor library creates and binds an HCI user channel
instead of talking to a serial port file descriptor. HCI frames
generated by the Android Bluetooth HAL are passed down as is to the
Linux kernel Bluetooth drivers through those sockets.
By pushing all the hardware dependencies down to the kernel, this
architecture supports all existing Linux Bluetooth drivers with
one single AOSP Bluetooth HAL implementation, Bluedroid.
Change-Id: I7197016b556e5d985843dd4f626db5d0f596f996
Arman Uguray [Fri, 24 Jul 2015 21:47:47 +0000 (21:47 +0000)]
am
065d0f70: service: Introduce a global Settings object
* commit '
065d0f709343129f82ff3d072dcb36f612038598':
service: Introduce a global Settings object
Arman Uguray [Fri, 17 Jul 2015 01:12:13 +0000 (18:12 -0700)]
service: Introduce a global Settings object
Introduced a global Settings object that will store all runtime properties that
would be associated with a config file, Android system properties, etc. Added a
mechanism to parse command-line options which can be used to pass paths to
configuration files, file path for UNIX domain socket based IPC mechanism, and
any other property that is dynamic in nature. This will help us remove hardcoded
paths, strings, and other such values in the future.
Bug:
22532366
Change-Id: I8e790363ed31d44369f7991a8ea7132d1cace70b
Arman Uguray [Fri, 24 Jul 2015 21:10:56 +0000 (21:10 +0000)]
am
f2d6434a: gn-build: Add bluetooth-service target
* commit '
f2d6434a6b7ad98e20c7a601d2a0950237514837':
gn-build: Add bluetooth-service target
Andre Eisenbach [Fri, 24 Jul 2015 20:23:41 +0000 (20:23 +0000)]
am
e03aaf82: am
fd726554: am
196413f5: Fix TX queue overflow detection
* commit '
e03aaf82bde453aece78d3979eb9075ea04a6766':
Fix TX queue overflow detection
Andre Eisenbach [Fri, 24 Jul 2015 19:54:23 +0000 (19:54 +0000)]
am
fd726554: am
196413f5: Fix TX queue overflow detection
* commit '
fd726554d65013f6e68daf263630018de9ca15ed':
Fix TX queue overflow detection
Andre Eisenbach [Fri, 24 Jul 2015 19:37:52 +0000 (19:37 +0000)]
am
196413f5: Fix TX queue overflow detection
* commit '
196413f5ca088ef97866092f02bb7571d2a44390':
Fix TX queue overflow detection
Andre Eisenbach [Wed, 22 Jul 2015 20:47:28 +0000 (13:47 -0700)]
Fix TX queue overflow detection
- Prevent possible endless loop if |nb_frame| is too high
- Remove off-by-one calculation before sending frames
- Remove log spam and add better debug info
Bug:
22658329
Change-Id: I374ee980aec48763beb49b4f6f8b076124cadf40
Pavlin Radoslavov [Fri, 24 Jul 2015 04:08:38 +0000 (04:08 +0000)]
am
945ba110: am
09d39288: am
1076b7b0: Customize Bluetooth sniff interval
* commit '
945ba1102613768b04b1878a6924e5e7ee4ea05d':
Customize Bluetooth sniff interval
Pavlin Radoslavov [Fri, 24 Jul 2015 03:09:28 +0000 (03:09 +0000)]
am
09d39288: am
1076b7b0: Customize Bluetooth sniff interval
* commit '
09d3928877e746c0e9dd3b8fe294a55432ec8d46':
Customize Bluetooth sniff interval
Pavlin Radoslavov [Thu, 23 Jul 2015 21:50:51 +0000 (21:50 +0000)]
am
79835b49: am
4e291106: am
197ee685: Fix a crash for a race condition during Bluetooth shutdown
* commit '
79835b4968d94f0be015b97bac4178b407da275d':
Fix a crash for a race condition during Bluetooth shutdown
Nitin Arora [Thu, 23 Jul 2015 21:50:50 +0000 (21:50 +0000)]
am
e61ad8de: am
8cc6e42e: am
ac72840a: Update device type correctly in the NVRAM at inquiry result
* commit '
e61ad8de11ed410c58a0d8f8456e56c81d64b111':
Update device type correctly in the NVRAM at inquiry result
Pavlin Radoslavov [Thu, 23 Jul 2015 19:22:18 +0000 (19:22 +0000)]
am
4e291106: am
197ee685: Fix a crash for a race condition during Bluetooth shutdown
* commit '
4e29110681953c45bbf43799d38b69cd5b447806':
Fix a crash for a race condition during Bluetooth shutdown
Nitin Arora [Thu, 23 Jul 2015 19:22:17 +0000 (19:22 +0000)]
am
8cc6e42e: am
ac72840a: Update device type correctly in the NVRAM at inquiry result
* commit '
8cc6e42efaac326520e8f9e28bd9e4e5e113fa6d':
Update device type correctly in the NVRAM at inquiry result
Pavlin Radoslavov [Thu, 23 Jul 2015 19:21:32 +0000 (19:21 +0000)]
am
1076b7b0: Customize Bluetooth sniff interval
* commit '
1076b7b0a642d0f5c5948819bcd07e4bc0fb2738':
Customize Bluetooth sniff interval
Pavlin Radoslavov [Thu, 23 Jul 2015 05:49:26 +0000 (22:49 -0700)]
Customize Bluetooth sniff interval
Fix an earlier commit that prevents from customizing some of
the Bluetooth sniff parameters - those cannot be overwritten
anymore in the bdroid_buildcfg.h file.
Also, fixed the indexing in tables bta_dm_pm_cfg[]
and bta_dm_pm_spec[]
Bug:
22676670
Change-Id: I3a7074b9a9c91d312dc5d4314b7c304baf4ae20d
Arman Uguray [Wed, 8 Jul 2015 22:47:39 +0000 (15:47 -0700)]
gn-build: Add bluetooth-service target
This patch makes the Bluetooth system service (service/) buildable using GN:
1. Added new BUILD.gn file for service/
2. Added conditional compilation for global config paths, with TODOs for
generalizing them later.
3. Added a shim for loading the Bluetooth library that calls hw_get_module on
Android and explicitly calls dlopen on OS_GENERIC.
4. Fixed compile warnings and errors.
5. Did some minor clean up in gatt_server.cpp for better readability.
Bug:
22124644
Change-Id: I3226537a3a5211a6762651a35707638df29956b0
Pavlin Radoslavov [Wed, 22 Jul 2015 20:24:37 +0000 (20:24 +0000)]
am
197ee685: Fix a crash for a race condition during Bluetooth shutdown
* commit '
197ee6856b43d8eea137a7f37798ee2a012ce518':
Fix a crash for a race condition during Bluetooth shutdown
Nitin Arora [Wed, 22 Jul 2015 20:23:42 +0000 (20:23 +0000)]
am
ac72840a: Update device type correctly in the NVRAM at inquiry result
* commit '
ac72840a3d7409adbb3ee4904ab1ed5de2d66586':
Update device type correctly in the NVRAM at inquiry result
Pavlin Radoslavov [Wed, 22 Jul 2015 01:09:19 +0000 (18:09 -0700)]
Fix a crash for a race condition during Bluetooth shutdown
This race condition is triggered when A2DP audio is streaming on shutdown:
"btif_a2dp_on_stopped() -> btif_media_task_aa_tx_flush_req()" is called
to stop the particular audio stream, and this happens right after
the "cleanup() -> btif_a2dp_stop_media_task()" processing during
the shutdown of the Bluetooth stack.
Bug:
22602117
Change-Id: I5de6a8f15b6a2771dde2e299a5b60554063696a2
Amirhossein Simjour [Wed, 22 Jul 2015 14:58:28 +0000 (14:58 +0000)]
am
6d9c7c90: am
04e684f8: Merge "Fix for uhid_event size check" into mnc-dr-dev
* commit '
6d9c7c90381c4bb94eeada7226f63f1ee3297a85':
Fix for uhid_event size check
Amirhossein Simjour [Wed, 22 Jul 2015 14:31:20 +0000 (14:31 +0000)]
am
04e684f8: Merge "Fix for uhid_event size check" into mnc-dr-dev
* commit '
04e684f8737d71c15bd1f7720333cce8e891a04e':
Fix for uhid_event size check
Amirhossein Simjour [Wed, 22 Jul 2015 14:20:25 +0000 (14:20 +0000)]
Merge "Fix for uhid_event size check" into mnc-dr-dev
Nitin Arora [Sat, 27 Jun 2015 01:09:37 +0000 (18:09 -0700)]
Update device type correctly in the NVRAM at inquiry result
This patch checks for the NVRAM data when inquiry result
is received from the remote device. In case the device is
marked as LE only or BR/EDR only, and inquiry result is
received from the alternate transport, the device type is
marked as Dual mode in the NVRAM
Bug:
22604450
Change-Id: Id925e8bad152a33c2bd3c371ca42a6f9c694e3b0
Nitin Arora [Tue, 21 Jul 2015 21:54:06 +0000 (21:54 +0000)]
am
2a7d33cd: am
1da48a36: Use pseudo address while re-pairing peripheral
* commit '
2a7d33cd21f7e0eb27681458b6c33fdd9f353fa5':
Use pseudo address while re-pairing peripheral
Nitin Arora [Tue, 21 Jul 2015 21:54:05 +0000 (21:54 +0000)]
am
dd9e79b8: am
b4365c55: Adding transport type while initiating remote discovery
* commit '
dd9e79b82b5cbd4531948943a8415917af781118':
Adding transport type while initiating remote discovery
Andre Eisenbach [Tue, 21 Jul 2015 21:37:05 +0000 (21:37 +0000)]
am
d9dec75f: am
280368c7: Fix potential crash when transcoding legacy config files
* commit '
d9dec75f63af551a0724aeaedab72b588ffc1c0e':
Fix potential crash when transcoding legacy config files
Nitin Arora [Tue, 21 Jul 2015 21:37:04 +0000 (21:37 +0000)]
am
1eeb7ae0: am
ccd37fa0: Enable enhanced connection complete event
* commit '
1eeb7ae0d9159f76a037050215e806f78bdee8bf':
Enable enhanced connection complete event
Nitin Arora [Tue, 21 Jul 2015 21:24:32 +0000 (21:24 +0000)]
am
1da48a36: Use pseudo address while re-pairing peripheral
* commit '
1da48a3600c980fe4ba825d287ff0ac5038be3ff':
Use pseudo address while re-pairing peripheral
Nitin Arora [Tue, 21 Jul 2015 21:24:31 +0000 (21:24 +0000)]
am
b4365c55: Adding transport type while initiating remote discovery
* commit '
b4365c55ccb2e985d00619c30dc14d5c156771b7':
Adding transport type while initiating remote discovery
Andre Eisenbach [Tue, 21 Jul 2015 21:09:57 +0000 (21:09 +0000)]
am
280368c7: Fix potential crash when transcoding legacy config files
* commit '
280368c7aa3b3e1dc5236a824f1f6c765967e253':
Fix potential crash when transcoding legacy config files
Nitin Arora [Tue, 21 Jul 2015 21:09:57 +0000 (21:09 +0000)]
am
ccd37fa0: Enable enhanced connection complete event
* commit '
ccd37fa0fed142dae2491212ec72e20d74560b59':
Enable enhanced connection complete event
Nitin Arora [Sat, 18 Jul 2015 01:38:01 +0000 (18:38 -0700)]
Use pseudo address while re-pairing peripheral
In case of pairing to an already paired device (in an instance
where the central remote has removed the keys), the change
makes sure that the correct address is used when LTK key
request occurs at the peripheral.
Bug:
22605510
Change-Id: I959003f39f70281ff1e6af8d4c4549138bc1682c
Nitin Arora [Fri, 26 Jun 2015 01:30:09 +0000 (18:30 -0700)]
Adding transport type while initiating remote discovery
This change ensures that the completion of SMP pairing for LE
devices specifically requests remote device discovery based on
transport type set to LE to prevent initiation of BR/EDR
connection due to incorrect transport type info
Bug:
22515456
Change-Id: Id1e5603d3cc53ca3dff427b93059a00f8d9150a7
Andre Eisenbach [Tue, 21 Jul 2015 20:02:57 +0000 (13:02 -0700)]
Fix potential crash when transcoding legacy config files
Bug:
22634292
Change-Id: I64745671f3b69fc7e6913213aeec55267e9bc49b
Nitin Arora [Thu, 2 Jul 2015 21:13:45 +0000 (14:13 -0700)]
Enable enhanced connection complete event
This change enables the enhanced connection complete event in order
to receive the local rpa address while connection is completed
with a paired peripheral. This is required if central tries to
repair or key upgrade an already paired device so that the confirm
or the DHKey Check values match during the pairing process
Bug:
22515703
Change-Id: If27f3b22bc568df6f081f8ad13dfc6783a83ae47
Amirhossein Simjour [Mon, 20 Jul 2015 18:29:19 +0000 (14:29 -0400)]
Fix for uhid_event size check
The uhid_event function used to expect that the return value of each
read function call to match with the size of the struct uhid_event.
Since the header file doesn't match the kernel driver, these two size
don't always match. The exact size check is replaced with expecting
the minimum required size.
Bug:
20108348
Change-Id: Ib61537092b109296f8290d802b68fc2efe78888c
Pavlin Radoslavov [Tue, 21 Jul 2015 04:47:07 +0000 (21:47 -0700)]
resolved conflicts for merge of
bd42d7bd to mnc-dr-dev-plus-aosp
Change-Id: Id1c6a57dd8db421eb233e0b9d73a6ef232bac35c
tturney [Tue, 21 Jul 2015 04:17:58 +0000 (04:17 +0000)]
am
9a347635: am
fb229d8b: Exclude Polar HR Monitor from secure conn
* commit '
9a347635f4b90f04174d7926b03e2e96b0c8a3fc':
Exclude Polar HR Monitor from secure conn
Pavlin Radoslavov [Tue, 21 Jul 2015 03:53:20 +0000 (03:53 +0000)]
am
65f9c04a: Fix the logic for removing bonded devices
* commit '
65f9c04aa36af5379ba3a28dba36a5de16686024':
Fix the logic for removing bonded devices
tturney [Tue, 21 Jul 2015 03:53:20 +0000 (03:53 +0000)]
am
fb229d8b: Exclude Polar HR Monitor from secure conn
* commit '
fb229d8bb57070f708b0018578ca2cf94b33b2a1':
Exclude Polar HR Monitor from secure conn
Pavlin Radoslavov [Fri, 17 Jul 2015 00:40:28 +0000 (17:40 -0700)]
Fix the logic for removing bonded devices
* Removed btif_storage_is_device_bonded(), because it is not needed,
and it was giving the wrong answer in use cases like Smart Setup
with BR/EDR connections.
* Added a call to btif_storage_remove_ble_bonding_keys()
within btif_storage_remove_bonded_device() so the bonded device
state is properly removed.
* Don't save the BLE bonding keys if it is temporary bonding
Bug:
22233299
Change-Id: I33d9f76a124acc60173f0acaa517bc29ee6603e8
tturney [Tue, 21 Jul 2015 02:28:40 +0000 (19:28 -0700)]
Exclude Polar HR Monitor from secure conn
Bug:
22473630
Change-Id: I1168444a6969532377e1bbcb2b1058d768099c20
Arman Uguray [Mon, 20 Jul 2015 21:51:54 +0000 (21:51 +0000)]
am
31f8902c: am
6670e315: Fix multi-advertising when LE Privacy is not available
* commit '
31f8902c2570fc1f86a59b58a4ec517875a54570':
Fix multi-advertising when LE Privacy is not available
Arman Uguray [Mon, 20 Jul 2015 21:23:53 +0000 (21:23 +0000)]
am
6670e315: Fix multi-advertising when LE Privacy is not available
* commit '
6670e3157c8510bc4b944c6a16d92db56adbb76c':
Fix multi-advertising when LE Privacy is not available
Arman Uguray [Sat, 18 Jul 2015 07:00:50 +0000 (00:00 -0700)]
Fix multi-advertising when LE Privacy is not available
This patch fixes a bug that caused all multi-advertising instances to be
initialized with Instance ID 0 (which is not allowed by the stack), if LE
privacy is not available. The problem was that the internal data structures that
represent advertising instances were not getting their |inst_id| field
initialized where it's supposed to.
Although far from clean, this code worked before. The culprit for the regression
is "
f9fdf890 Random address does not get written properly", which moved the
initialization of instance IDs from the loop in BTM_BleEnableAdvInstance to
btm_ble_multi_adv_enb_privacy. The latter never gets called if privacy is not
available, which leads to partially initialized structures.
Obviously both of these places were wrong to begin with. I saw the word
"init" in a function called btm_ble_multi_adv_init. I figured this might have
something to do with initializing, so I moved the logic there.
Bug:
21267281
Change-Id: I38b9a2a71cd3f45feb267a13bf29f93564ee6075
Nitin Arora [Fri, 17 Jul 2015 01:17:12 +0000 (01:17 +0000)]
am
66439e94: am
f0e9c466: Add Moto Key Link to blacklist for LE secure connections
* commit '
66439e948f0a9e7c814b39beee1449f826e62a1c':
Add Moto Key Link to blacklist for LE secure connections
Nitin Arora [Fri, 17 Jul 2015 00:50:01 +0000 (00:50 +0000)]
am
f0e9c466: Add Moto Key Link to blacklist for LE secure connections
* commit '
f0e9c46646bf49db05a1dcbecdc0bd64d086f623':
Add Moto Key Link to blacklist for LE secure connections
Nitin Arora [Fri, 10 Jul 2015 18:24:47 +0000 (11:24 -0700)]
Add Moto Key Link to blacklist for LE secure connections
This change allows the host to mask the Cross key bit in
the key distribution fields of the pairing request and
response while pairing with the Moto key link. This is
needed since this specific remote device performs
calculations of the pairing confirm after masking the
cross key bit in the key distribtuin field which results
in a mismatch of the pairing confirm calcualted by the host
DUT and the remote.
Bug:
22539807
Change-Id: I7d758b05023cf346c97939883edda9d3adb08e1a
Arman Uguray [Thu, 16 Jul 2015 19:05:55 +0000 (19:05 +0000)]
am
fa4bc548: am
50333a25: Properly disconnect GATT connection during noisy scans
* commit '
fa4bc5486aaba9eb6cd9eab7fe5d8c0ad423040c':
Properly disconnect GATT connection during noisy scans
Sharvil Nanavati [Thu, 16 Jul 2015 18:55:57 +0000 (18:55 +0000)]
am
f060365b: Add a SCO routing command to net_hci.
* commit '
f060365bf10c41c67d23337242802ffcb0a72895':
Add a SCO routing command to net_hci.
Arman Uguray [Thu, 16 Jul 2015 18:38:11 +0000 (18:38 +0000)]
am
50333a25: Properly disconnect GATT connection during noisy scans
* commit '
50333a25ba3dac54033738d1e2a2688e2977ff2e':
Properly disconnect GATT connection during noisy scans
Sharvil Nanavati [Thu, 16 Jul 2015 09:55:27 +0000 (02:55 -0700)]
Add a SCO routing command to net_hci.
This allows us to change the SCO routing parameters at runtime while
debugging / doing device bringup.
Change-Id: I8bafb7c7fb7ad7470d378cd14a7ee4aad63f3b9b
Arman Uguray [Wed, 15 Jul 2015 23:05:32 +0000 (16:05 -0700)]
Properly disconnect GATT connection during noisy scans
This patch fixes an issue that is reproducible in highly noisy environments
(massive deployment of BLE beacons), through repeated connect/disconnect
attempts on a remote peripheral while scanning for beacons in the background.
The state machine in bta/gatt has a special control flow for handling disconnect
requests during discovery, which in this case failed to resolve the original
request by issuing an HCI_Disconnect command. This is now fixed by always
explicitly triggering the connection close sequence once the discovery state has
been cleaned up.
This patch also includes a fix for a crash that occurred as a side-effect of the
scenario described above.
Bug:
22350508
Change-Id: Ie9cbd3c8f54239b142bfb8dde80d9581ae70ed43
Andre Eisenbach [Wed, 15 Jul 2015 23:12:28 +0000 (23:12 +0000)]
am
165332bc: Cleanup alarm_get_remaining_ms
* commit '
165332bc6795049754fafe35024c2c605796c96a':
Cleanup alarm_get_remaining_ms
Nitin Arora [Wed, 15 Jul 2015 23:12:27 +0000 (23:12 +0000)]
am
ac1399a7: Use correct own address type for batch scan
* commit '
ac1399a7aab6051f984235971573d62ddf76891d':
Use correct own address type for batch scan
Andre Eisenbach [Wed, 15 Jul 2015 19:35:15 +0000 (12:35 -0700)]
Cleanup alarm_get_remaining_ms
This function is used for PM sniff mode timers - at least until we can
re-factor those not to rely on this function.
Bug:
22040710
Change-Id: Ibe6f49440228732b2bd8242db4a44e481b00b62e
Nitin Arora [Fri, 19 Jun 2015 02:09:01 +0000 (19:09 -0700)]
Use correct own address type for batch scan
This patch ignores the input parameter and used the own
address type from address management block while setting
the batch scan parameters.
Bug:
22227689
Change-Id: I23fc80b68cfbd91d718c1094ef2483eaccda3ae1
VenkatRaghavan VijayaRaghavan [Wed, 15 Jul 2015 06:49:47 +0000 (06:49 +0000)]
am
76356aee: Bug fix PM changes and LE connectivity mode fixes
* commit '
76356aee883af67898ddc1aa3b628195f396d42a':
Bug fix PM changes and LE connectivity mode fixes
Srinu Jella [Wed, 15 Jul 2015 05:44:53 +0000 (05:44 +0000)]
am
21331c62: Store the link key derived from cross tranport link key
* commit '
21331c62310dda2f523712c536da3e65afce0f38':
Store the link key derived from cross tranport link key
VenkatRaghavan VijayaRaghavan [Tue, 21 Apr 2015 18:32:29 +0000 (11:32 -0700)]
Bug fix PM changes and LE connectivity mode fixes
Allow PM to support multiple delay timer for different profiles and
power mode requests. And set correct connectivity mode.
Bug:
22040710
Change-Id: Idabd9ea944f0c5a89ce542d85db9f103fa7d1816
Srinu Jella [Tue, 16 Jun 2015 14:08:45 +0000 (19:38 +0530)]
Store the link key derived from cross tranport link key
Use case: PTS test case for cross transport link key
derivation
Steps to reproduce:
1. Start Test case GAP TP/LEP/DM/BV-15 in PTSv6.0
Failure: PTS test case TP/LEP/DM/BV-15 fails as the link
key is not stored when the key is derived from other
transport key. So it will again go for pairing even though
it has link key but not stored.
Root cause: Link key is stored only when bond type is
presistent, but it sets the bond type to persistent only
when it receives SSP request but not link key is derived.
Fix: So making the solution generic to store always when the
link key type is authenticated combination key with P-256.
Bug:
22486860
Change-Id: I3eb201262f72c86a9438351cad14a6698065fa90
Arman Uguray [Tue, 14 Jul 2015 19:32:33 +0000 (12:32 -0700)]
osi: Fix compile error due to API change on AOSP
All LOG_* functions require a first argument "tag", which was added on AOSP.
Change-Id: I2e678baa5da1cbf7073291983a0339dade6abca8