OSDN Git Service
Glenn Kasten [Wed, 17 Aug 2016 01:52:52 +0000 (01:52 +0000)]
Merge "Fix a typo in pre-compiler error message" am:
7cc80100e1
am:
8461b92874
Change-Id: Ib09fa2926b76be300f31f9144356742ca7106b03
Glenn Kasten [Wed, 17 Aug 2016 01:50:24 +0000 (01:50 +0000)]
Merge "Fix a typo in pre-compiler error message"
am:
7cc80100e1
Change-Id: Ieccd17672a872e3d60bb48cf1b3a34c8cbe09ae9
Treehugger Robot [Wed, 17 Aug 2016 01:44:34 +0000 (01:44 +0000)]
Merge "Fix a typo in pre-compiler error message"
Andre Eisenbach [Wed, 17 Aug 2016 01:17:50 +0000 (01:17 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist am:
ed272ff2f7
am:
765dcf9c6f
Change-Id: I8a3996d03d97e9ee3658dde9b0ba170c4f2e78c1
Andre Eisenbach [Wed, 17 Aug 2016 01:14:22 +0000 (01:14 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist
am:
ed272ff2f7
Change-Id: I1b39608a553f5cef0748c9b6464fa92cc1eee823
Glenn Kasten [Tue, 8 Mar 2016 20:11:38 +0000 (12:11 -0800)]
Fix a typo in pre-compiler error message
Change-Id: Ia584c748ea065739e0f6df1ea8a86df517a257af
Sathya Kumar [Wed, 17 Aug 2016 00:02:19 +0000 (00:02 +0000)]
Disable 3Mbps packets for AVDT ACL links am:
f527ce28b4 -s ours
am:
d0ca1d1483
Change-Id: Ic5b666d6d2ab236152a8c3b450b48fab5357a95f
Sathya Kumar [Tue, 16 Aug 2016 23:58:21 +0000 (23:58 +0000)]
Disable 3Mbps packets for AVDT ACL links
am:
f527ce28b4 -s ours
Change-Id: I2b464cbf192b41edfd904ae4eddd7159a64213e7
Andre Eisenbach [Mon, 27 Jun 2016 22:49:53 +0000 (15:49 -0700)]
Add Subaru and Nissan car kits to auto pair blacklist
Bug:
29157087
Change-Id: If227963b939a9b0ed55e6d900364c71932d3cfe8
(cherry picked from commit
d13870072e61e468e6cd8f3e007a1647f7001a14)
Sathya Kumar [Tue, 16 Aug 2016 22:37:40 +0000 (22:37 +0000)]
resolve merge conflicts of
37119da to stage-aosp-master
am:
61ee6c68a2
Change-Id: Ic66f39df5e2e8d861b9e56354e0f526a2bcfe9d6
Sathya Kumar [Thu, 7 Jan 2016 23:26:05 +0000 (17:26 -0600)]
Disable 3Mbps packets for AVDT ACL links
Change-Id: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
(cherry picked from commit
26bb30842b6c64821c2a6c4a515f290140017105)
Merged-In: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
Sathya Kumar [Thu, 7 Jan 2016 23:26:05 +0000 (17:26 -0600)]
resolve merge conflicts of
37119da to stage-aosp-master
Change-Id: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
(cherry picked from commit
26bb30842b6c64821c2a6c4a515f290140017105)
Pavlin Radoslavov [Tue, 16 Aug 2016 21:02:34 +0000 (21:02 +0000)]
Use C++ style std::string instead of C-style string
am:
d97874240b
Change-Id: Ied3b1fd784cdd40c8612282497f0f7a0dce47010
Pavlin Radoslavov [Tue, 16 Aug 2016 17:44:36 +0000 (10:44 -0700)]
Use C++ style std::string instead of C-style string
Change-Id: I323187bca7555adada2a8a5cf2c25e30592040b1
Sridhar Vashist [Tue, 16 Aug 2016 10:25:30 +0000 (10:25 +0000)]
Merge "Make default SBC bitrate configurable by device." am:
57e911ea25
am:
a918f41b60
Change-Id: I9ef79d797c5da8416d52232dbab28d62585c837c
Sridhar Vashist [Tue, 16 Aug 2016 10:21:38 +0000 (10:21 +0000)]
Merge "Make default SBC bitrate configurable by device."
am:
57e911ea25
Change-Id: I3233e531e724bb1fa27afc73bc78c5fdf3ad5117
Treehugger Robot [Tue, 16 Aug 2016 10:15:01 +0000 (10:15 +0000)]
Merge "Make default SBC bitrate configurable by device."
Sridhar Vashist [Tue, 16 Aug 2016 09:48:04 +0000 (09:48 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am:
21a7e48c0f
am:
0c1fffb857
Change-Id: I18ea1e681745866caa8e9ea93111e088893e7a48
Sridhar Vashist [Tue, 16 Aug 2016 09:44:06 +0000 (09:44 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
am:
21a7e48c0f
Change-Id: If6b31a75dfd04c69e620402e81df741c348f714c
Treehugger Robot [Tue, 16 Aug 2016 09:37:37 +0000 (09:37 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
Sridhar Vashist [Wed, 14 Oct 2015 22:47:02 +0000 (17:47 -0500)]
Make default SBC bitrate configurable by device.
Configurable default SBC bitrate so that audio quality can be maintained
for sampling rates other than 44.1kHz
Change-Id: Ia4197c0a500088cfa48a8ba821e9738a16c3fc6e
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
(cherry picked from commit
5f308397b7fe8a8da3f88b0f8910c3863ed1ec0b)
ugo_yu [Tue, 16 Aug 2016 08:34:29 +0000 (08:34 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed" am:
bb75465676
am:
a430cc3b4e
Change-Id: I265d1235811f23d40db916ca3c43f8eff8a44e6c
ugo_yu [Tue, 16 Aug 2016 08:30:32 +0000 (08:30 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed"
am:
bb75465676
Change-Id: Ia3bd8ef88282634a6d142593f9edb8ba41c65ac5
Treehugger Robot [Tue, 16 Aug 2016 08:22:56 +0000 (08:22 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed"
Sridhar Vashist [Fri, 7 Aug 2015 00:40:24 +0000 (19:40 -0500)]
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.
There appear to be race cases where the peer sends a START before
we reconfigure the stream. Avoid btif_av state from getting
mismatched by always sending out the SUSPEND_CFM during RECONFIGURE.
Change-Id: I2034cd111466f792233cedb60a3a0df11d055962
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
(cherry picked from commit
8b1c7af03a2a8eedd1efd2eddca3ecd4b61bfd95)
Marie Janssen [Tue, 16 Aug 2016 07:44:56 +0000 (07:44 +0000)]
Merge "Check size of pin before replying" am:
545ac907dd
am:
e4047a70e5
Change-Id: I978c74e497ab8dc2b2927ed814ce8f6dddd3de29
Marie Janssen [Tue, 16 Aug 2016 07:40:58 +0000 (07:40 +0000)]
Merge "Check size of pin before replying"
am:
545ac907dd
Change-Id: Ibbf6e58b4297871899baa85b9bfa3510eac402b1
Treehugger Robot [Tue, 16 Aug 2016 07:35:18 +0000 (07:35 +0000)]
Merge "Check size of pin before replying"
Andy Hung [Tue, 16 Aug 2016 07:28:56 +0000 (07:28 +0000)]
audio_a2dp_hw: Always update frame counter in out_write am:
cd85170ab8
am:
8d3142f759
Change-Id: I6e0399b88f634c027d639b5ff3506feb94d391e3
Andy Hung [Tue, 16 Aug 2016 07:24:56 +0000 (07:24 +0000)]
audio_a2dp_hw: Always update frame counter in out_write
am:
cd85170ab8
Change-Id: Ic87913c0b7d8ed7d3d8dceb4a292517706e1724b
ugo_yu [Fri, 3 Jun 2016 10:04:24 +0000 (18:04 +0800)]
GATT: Deregister notification when a GATT connection is closed
Precondition:
1. Pair with specific HOGP mouse.
Steps:
1. Pair with HOGP mouse (iBuffalo BSMBB09DS)
2. Unpair the mouse.
3. Pair the mouse again.
Failure:
Pairing is successful, but the mouse won't connect.
Root Cause:
Some HOGP mice send notifications before the stack writes the
client characteristic configuration descriptor.
The Bluetooth stack doesn't deregister these notifiactions
when disconnecting.
Fix:
Deregister notifications when the GATT connection closes.
Fixes:
29111689
Change-Id: I520faeaa5fc396381cb248d3a2c49efbffa12261
(cherry picked from commit
7592bcfe7a0be9dc4ffdfc3f29bf68fd68950418)
Marie Janssen [Wed, 9 Mar 2016 23:31:48 +0000 (15:31 -0800)]
Check size of pin before replying
If a malicious client set a pin that was too long it would overflow
the pin code memory.
Bug:
27411268
Change-Id: I9197ac6fdaa92a4799dacb6364e04671a39450cc
(cherry picked from commit
7120b9f35f1c3d8b4f115bc9bb39ab39443886e1)
Andy Hung [Thu, 28 Jul 2016 17:45:54 +0000 (10:45 -0700)]
audio_a2dp_hw: Always update frame counter in out_write
Required now that we always return success.
Bug:
30025777
Change-Id: I7db51321672c128039545cc0fb604c615f169bc3
(cherry picked from commit
f4a37b255d1d6fa4cf7cefe2aeb1c3f4fdf33f3c)
Andre Eisenbach [Tue, 16 Aug 2016 05:50:50 +0000 (05:50 +0000)]
Remove SBC frame scrambling am:
7fcea70080
am:
3753c01648
Change-Id: I2c45a530f9244c87598cd4c2c7e0d716bdf551a5
Andre Eisenbach [Tue, 16 Aug 2016 05:46:52 +0000 (05:46 +0000)]
Remove SBC frame scrambling
am:
7fcea70080
Change-Id: If59587ff211e5ce378e4258aabcb7a32774553a9
Andre Eisenbach [Thu, 23 Jun 2016 22:25:44 +0000 (15:25 -0700)]
Remove SBC frame scrambling
Bug:
29601962
Change-Id: I30ce09f1c7550a1be9fd1c8ed70745f9aa0cdb44
(cherry picked from commit
470aee234664fd75094c16dd2c70313ee28354c1)
Jacky Cheung [Tue, 16 Aug 2016 03:44:13 +0000 (03:44 +0000)]
Merge "New status code for two SMP authorization failures" am:
b29732059e
am:
734ba5b0a8
Change-Id: I9c545f839aff1ca19cb92db4181ea01e35dbb7ac
Andre Eisenbach [Tue, 16 Aug 2016 03:44:13 +0000 (03:44 +0000)]
HID: Check for EINTR in uhid_event() and fix return value evaluation am:
acb093ada7
am:
a319edc546
Change-Id: I28af2d6aa90f187136de6ec5e9ce2c7762da5fb7
Jacky Cheung [Tue, 16 Aug 2016 03:40:18 +0000 (03:40 +0000)]
Merge "New status code for two SMP authorization failures"
am:
b29732059e
Change-Id: I8d05dde66952f263ebfcc81cbc38b0f27675efd7
Andre Eisenbach [Tue, 16 Aug 2016 03:40:15 +0000 (03:40 +0000)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
am:
acb093ada7
Change-Id: I4c7269a3aee069ca725eec0faa885100171e198d
Treehugger Robot [Tue, 16 Aug 2016 03:37:09 +0000 (03:37 +0000)]
Merge "New status code for two SMP authorization failures"
Jacky Cheung [Wed, 6 Jul 2016 22:11:30 +0000 (15:11 -0700)]
New status code for two SMP authorization failures
On BTA_DM_AUTH_SMP_UNKNOWN_ERR and BTA_DM_AUTH_SMP_CONN_TOUT, bond state
status will be notified as BT_STATUS_AUTH_FAILURE. This is observed during
the pairing flow with iOS devices.
Plus minor cleanup on SMP errors and fail reasons.
Bug:
29779689
Change-Id: Ia32fe6bb84b07272d5159409f65217a06a2e5f8e
(cherry picked from commit
6984b19d95736d7205fc6302a21e8be564617287)
Pavlin Radoslavov [Tue, 16 Aug 2016 01:31:05 +0000 (01:31 +0000)]
Removed bogus leftover code that wasn't auto-merged properly
am:
3c48d11354
Change-Id: I01b99c8b2968ab03055bd0f1d379b558f26d2b42
Pavlin Radoslavov [Tue, 16 Aug 2016 00:43:30 +0000 (17:43 -0700)]
Removed bogus leftover code that wasn't auto-merged properly
Change-Id: I41c2869ae32f08bc170cc222f036e0bc207b81f9
Jorge E. Moreira [Mon, 15 Aug 2016 21:26:22 +0000 (21:26 +0000)]
Refactor vendor library to use async manager class am:
0b32c8d8c1
am:
db7cab56f9
Change-Id: I6d23d7a8c5d6f4c82574817e526f31a9eec08f88
Jorge E. Moreira [Mon, 15 Aug 2016 21:26:20 +0000 (21:26 +0000)]
Added the async manager am:
08c214154d
am:
d87ecf6aed
Change-Id: Ia1d7c4774a4433ae8975ebc62eafbfb72442b6ec
Jorge E. Moreira [Mon, 15 Aug 2016 21:21:25 +0000 (21:21 +0000)]
Refactor vendor library to use async manager class
am:
0b32c8d8c1
Change-Id: Ifeb58d21c5343f7fe42b6bce87cb03b2063003ee
Jorge E. Moreira [Mon, 15 Aug 2016 21:21:23 +0000 (21:21 +0000)]
Added the async manager
am:
08c214154d
Change-Id: I583d351023846be861018cd67f5410a50d98a12a
Jorge E. Moreira [Mon, 15 Aug 2016 21:17:32 +0000 (21:17 +0000)]
Added missing #include directives am:
65ee728284
am:
9d427f118f
Change-Id: Icd3c8d63b3ce5ef2f9cba23845f391ecbce1e194
Andre Eisenbach [Mon, 30 May 2016 19:00:46 +0000 (12:00 -0700)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
uhid_event() returns 0 in the normal case. Commit
3a2c2d61
results in the polling thread to be exited.
Bug:
28942565
Change-Id: Id0aff2958bc7c2704ba340aa0ff7848afb8dcf80
(cherry picked from commit
32d66694e9f782a0e9dfa423015284a573f8975c)
Jorge E. Moreira [Mon, 8 Aug 2016 18:39:52 +0000 (11:39 -0700)]
Refactor vendor library to use async manager class
Homogenizes the use of lambdas/binds (uses c++ lambdas only)
Uses STL's time library implementation (std::chrono)
Change-Id: I6194b26c0a7fabffddf96acb5c2379ff52026a84
Jorge E. Moreira [Mon, 15 Aug 2016 21:13:38 +0000 (21:13 +0000)]
Added missing #include directives
am:
65ee728284
Change-Id: I5b293b7ff4665312efdf1bcc00a6f2f5058d2670
Jorge E. Moreira [Mon, 8 Aug 2016 18:39:52 +0000 (11:39 -0700)]
Added the async manager
Change-Id: I968fee42fd610e33e13bf358f54bec1fe7af4a7d
Jorge E. Moreira [Tue, 9 Aug 2016 22:21:01 +0000 (15:21 -0700)]
Added missing #include directives
Change-Id: Ia26cd6775699c65a75d94003c09730926835f7a3
Jorge E. Moreira [Mon, 15 Aug 2016 20:56:18 +0000 (20:56 +0000)]
Replace calls to std::bind by lambda expressions am:
97980c25a1
am:
20641629e6
Change-Id: I925b08e456318959c95a10d3c292f2f6fd9079bc
Jorge E. Moreira [Mon, 15 Aug 2016 20:51:50 +0000 (20:51 +0000)]
Replace calls to std::bind by lambda expressions
am:
97980c25a1
Change-Id: Iad98f599d6bd802c42b583c6bb5d8e75da568839
Jorge E. Moreira [Mon, 15 Aug 2016 19:21:42 +0000 (19:21 +0000)]
No longer uses the macro DISALLOW_COPY_AND_ASSIGN am:
83cf95e0a1
am:
ece79cdeac
Change-Id: Id6e20889627f056a624c02bad3b121aab227d92b
Jorge E. Moreira [Mon, 15 Aug 2016 19:21:41 +0000 (19:21 +0000)]
Using include paths relative to vendor library dir am:
ea3ede2474
am:
c7dd1eae5e
Change-Id: I28b389ee7eb887cd328b59c28a6ddfcd8dc6937c
Jorge E. Moreira [Mon, 15 Aug 2016 19:17:44 +0000 (19:17 +0000)]
No longer uses the macro DISALLOW_COPY_AND_ASSIGN
am:
83cf95e0a1
Change-Id: I6bd4c3d3bb9b12ce8a167769ce4be5dbefebe10a
Jorge E. Moreira [Mon, 15 Aug 2016 19:17:41 +0000 (19:17 +0000)]
Using include paths relative to vendor library dir
am:
ea3ede2474
Change-Id: Ic703fda9a8c7d72f6fb563069d1948f190ac7924
Jorge E. Moreira [Fri, 5 Aug 2016 18:07:07 +0000 (11:07 -0700)]
Replace calls to std::bind by lambda expressions
Change-Id: I5fbe6ae6d5172e87428322084276e593a67fd7d1
Jorge E. Moreira [Thu, 4 Aug 2016 23:55:31 +0000 (16:55 -0700)]
No longer uses the macro DISALLOW_COPY_AND_ASSIGN
Change-Id: I3403cdfa38fabf56ffe0854064eeb0ae38eb5a4a
Jorge E. Moreira [Thu, 4 Aug 2016 23:46:45 +0000 (16:46 -0700)]
Using include paths relative to vendor library dir
Change-Id: I6b5dfa4098cdf2eda21d3fae60729b765532c2f9
Andy Hung [Mon, 15 Aug 2016 18:24:38 +0000 (18:24 +0000)]
Merge "Improve BT HAL write response to BT server reads" am:
f65e83e5b1
am:
268069aab8
Change-Id: I1b592d85515b06b2a4c7534bb54609df9da981da
Andy Hung [Mon, 15 Aug 2016 18:20:11 +0000 (18:20 +0000)]
Merge "Improve BT HAL write response to BT server reads"
am:
f65e83e5b1
Change-Id: Ib48a998e19b3eada7d19897b81626f60309062b3
Treehugger Robot [Mon, 15 Aug 2016 18:15:31 +0000 (18:15 +0000)]
Merge "Improve BT HAL write response to BT server reads"
Pavlin Radoslavov [Mon, 15 Aug 2016 18:03:35 +0000 (18:03 +0000)]
Separate the Alarm unit tests from testing the Wakelocks am:
223cecf8b6
am:
246d21b152
Change-Id: I993ea35259eb6a033408e990748b88dd386d198e
Pavlin Radoslavov [Mon, 15 Aug 2016 17:59:38 +0000 (17:59 +0000)]
Separate the Alarm unit tests from testing the Wakelocks
am:
223cecf8b6
Change-Id: Iceb0a3e4d2f776456cad88a5276dbd9516baf175
Andy Hung [Wed, 15 Jun 2016 02:58:58 +0000 (19:58 -0700)]
Improve BT HAL write response to BT server reads
By polling, we ensure the socket buffer is nearly always full,
as blocking socket writes may not wake in time to avoid underflow.
Bug:
28286313
Change-Id: I056768dbd860993c41d44c33a4846d62c50db933
(cherry picked from commit
5952e40bef1afb310cd3bba7e673163d7e32d62c)
Pavlin Radoslavov [Mon, 8 Aug 2016 18:18:47 +0000 (11:18 -0700)]
Separate the Alarm unit tests from testing the Wakelocks
* Simplify the AlarmTestHarnless unit test setup for Wakelocks.
Now we use wakelock_set_os_callouts() to setup local unit tests and
to keep local state whether the wakelock is acquired.
Also, removed unused timer-related setup inside AlarmTestHarnless.
* Add explicit Wakelock unit tests
Change-Id: I08bd8d457fd48ec45a8a591bd69cb08dbaf5ee7a
Jakub Pawlowski [Thu, 11 Aug 2016 23:10:26 +0000 (23:10 +0000)]
Add LE Secure Connection data parsing (3/4) am:
bd60854e49
am:
2eab00ba4a
Change-Id: I889b02129cc85066ceada7c2d9cfcb74b411b450
Jakub Pawlowski [Thu, 11 Aug 2016 23:06:57 +0000 (23:06 +0000)]
Add LE Secure Connection data parsing (3/4)
am:
bd60854e49
Change-Id: Ia33a911e973fe22b72a4bf4f3ce89d20b9b71fea
Jakub Pawlowski [Thu, 28 Jul 2016 12:58:35 +0000 (05:58 -0700)]
Add LE Secure Connection data parsing (3/4)
Bug:
30460956
Change-Id: I216142090fe99b25ef7697fceceb278b761a182b
Satomi [Tue, 9 Aug 2016 20:26:45 +0000 (20:26 +0000)]
Revert "Register for Service Changed notifications for untrusted devices" am:
42657c2f23
am:
ef259dd0fb
Change-Id: I7bc5b5a8681629c6c16431e654feaffd1dae8b49
Satomi [Tue, 9 Aug 2016 20:23:51 +0000 (20:23 +0000)]
Revert "Register for Service Changed notifications for untrusted devices"
am:
42657c2f23
Change-Id: I01ff859d5158904695965a0038b252fc98c9096d
Satomi [Tue, 9 Aug 2016 15:19:03 +0000 (08:19 -0700)]
Revert "Register for Service Changed notifications for untrusted devices"
This reverts commit
5f0e23d532f4f90d081ccc0e294f404eb5e5b688.
Instead of reusing service discovery data, gatt profile initiates
discovery by service uuid before regular service discovery is started,
and both discovery procedures interfere with each other.
As a result, link is dropped.
Bug:
30462943
Bug:
30481143
Change-Id: Ic63339f4f46eda70e575a4103974766d54a9d624
Signed-off-by: Satomi <michitsuta@casio.co.jp>
Satish Kodishala [Tue, 9 Aug 2016 18:19:00 +0000 (18:19 +0000)]
strlcpy call size fixes, memory clearing am:
4fd9ce1b4d
am:
6157dc7459
Change-Id: Ib258a1623314aefcb1479b8efa0042719e968fb3
Satish Kodishala [Tue, 9 Aug 2016 18:13:45 +0000 (18:13 +0000)]
strlcpy call size fixes, memory clearing
am:
4fd9ce1b4d
Change-Id: I563fa0319297ae930efc5eb114ecf639b0a5096e
Satish Kodishala [Fri, 5 Feb 2016 07:05:54 +0000 (12:35 +0530)]
strlcpy call size fixes, memory clearing
Usecase:
1. Run PTS test cases IIA BV-03-I/IIC BV-02-I/IID BV-01-I
Failure:
Randomly errors are returned for AT+BIA from PTS.
Cause:
Command parsing advances the check beyond the string end,
which is not guaranteed to be zeroed.
Fix:
Break string parsing when the end of string is encountered
after a AT+BIA argument.
Bug:
29615016
Change-Id: Ifc77435e780fba34006372694a7da4758e4f8c36
Jakub Pawlowski [Tue, 9 Aug 2016 10:58:42 +0000 (10:58 +0000)]
Merge "Fix descriptor write" am:
a8be6caf45
am:
d3e28d696a
Change-Id: Ic305147474f43c87c3b0693061ba12cd66fc82de
Jakub Pawlowski [Tue, 9 Aug 2016 10:56:15 +0000 (10:56 +0000)]
Merge "Fix descriptor write"
am:
a8be6caf45
Change-Id: I6346731e787457bbd013c958ccb306f470e9bc00
Jakub Pawlowski [Tue, 9 Aug 2016 10:48:53 +0000 (10:48 +0000)]
Merge "Fix descriptor write"
Jakub Pawlowski [Tue, 9 Aug 2016 10:44:05 +0000 (03:44 -0700)]
Fix descriptor write
This patch fixes error introduced in commit
bb920a65b959fbb593403587f89bc3fc7e831732
Writing descriptor was broken, ACTS tests were failing.
Change-Id: Ied2ff4a12df1053961677fdcb824838b7946dbaa
Jacky Cheung [Mon, 8 Aug 2016 17:49:08 +0000 (17:49 +0000)]
Add dumpsys support for LE connection parameter updates am:
8ec8ca4a87
am:
6fdfdef14f
Change-Id: I5e1a8ae04e0d88a9dfcc3f4459a187954e0729eb
Jacky Cheung [Mon, 8 Aug 2016 17:46:40 +0000 (17:46 +0000)]
Add dumpsys support for LE connection parameter updates
am:
8ec8ca4a87
Change-Id: I0966798416b8a7c784f4b1e6d5af593e91006990
Jacky Cheung [Thu, 4 Aug 2016 17:20:39 +0000 (10:20 -0700)]
Add dumpsys support for LE connection parameter updates
Change-Id: Ie203eec9d8efec0d55b1b10208c64a98449044a2
(cherry picked from commit
4e5514b69b95ee1416fb0d0b5e7783bcfe1612ab)
Marie Janssen [Sat, 6 Aug 2016 00:05:41 +0000 (00:05 +0000)]
resolve merge conflicts of
d19e078 to stage-aosp-master
am:
b91e97ba44
Change-Id: I76bc52887f10e59f5c5fbe8296a50e2f4781af65
Marie Janssen [Sat, 6 Aug 2016 00:02:23 +0000 (17:02 -0700)]
resolve merge conflicts of
d19e078 to stage-aosp-master
Change-Id: I901ce1a7cafc2f526d8a7e515e9fe8ffdd20f33e
Marie Janssen [Fri, 15 Jul 2016 19:48:27 +0000 (12:48 -0700)]
Use standard types, consistent ifdef style everywhere
Remove the typedefs in stack/include/bt_types.h
Use standard types everywhere.
Use standard style for #if statements:
- #if (VAR_NAME == TRUE)
- #if (VAR_NAME1 == TRUE && VAR_NAME2 == TRUE)
Use __func__ instead of __FUNCTION__
Fix some debug statements to use __func__
Update script to be less disruptive to aligned assignment blocks.
Change-Id: I8f8f068e6c26ce74fd3b3707e1e31fd0b919cdd0
Jakub Pawlowski [Fri, 5 Aug 2016 19:24:03 +0000 (19:24 +0000)]
Fix APR crashes in read rssi callback am:
7294d958dc
am:
e449d19a74
Change-Id: I2a3f0294fe2578e28e546b7aedc4562dda34ecad
Jakub Pawlowski [Fri, 5 Aug 2016 19:21:35 +0000 (19:21 +0000)]
Fix APR crashes in read rssi callback
am:
7294d958dc
Change-Id: I5e7daa5962e92c8fb2c6adf683fe616f0af294d1
Jakub Pawlowski [Wed, 3 Aug 2016 22:43:56 +0000 (15:43 -0700)]
Fix APR crashes in read rssi callback
When read RSSI timeouts, callback is called with NULL result. This was
causing crash.
Bug:
30562545
Change-Id: I05b7eb2808c58655525ed5c7019ae175181c837a
Greg Hartman [Thu, 4 Aug 2016 23:29:48 +0000 (23:29 +0000)]
Implements some additional commands am:
03c2c7c22a
am:
4c95eabead
Change-Id: Ic7050227fde19166acc3d316b06d934f6e3423a5
Greg Hartman [Thu, 4 Aug 2016 23:27:29 +0000 (23:27 +0000)]
Implements some additional commands
am:
03c2c7c22a
Change-Id: I5a0f2011966daad1679a4f196996552db40f5e56
Greg Hartman [Tue, 26 Jul 2016 20:19:02 +0000 (13:19 -0700)]
Implements some additional commands
- Added/Improved responses to certain opcodes on bt_vendor.cc
- Added handlers for a couple of commands used in L
Change-Id: I85c02553057e4ea3a3e51795c2e1a2bb679fd5e1
Mudumba Ananth [Thu, 4 Aug 2016 01:47:47 +0000 (01:47 +0000)]
HFP 1.7 profile update (1/4) am:
4de9bbcde7
am:
381ffde672
Change-Id: I5d8fc1329bf2712a3bf7bb5462cb0ef793af8791
Mudumba Ananth [Thu, 4 Aug 2016 01:37:03 +0000 (01:37 +0000)]
HFP 1.7 profile update (1/4)
am:
4de9bbcde7
Change-Id: I52433802594e44702152b57f00f7d5511f4741ac
Mudumba Ananth [Mon, 29 Feb 2016 10:21:43 +0000 (02:21 -0800)]
HFP 1.7 profile update (1/4)
-> Added AG support for HFP 1.7 version upgrade which
adds new type of indicator called HF(headset) indicators.
-> Added support for two new AT commands AT + BIND and AT + BIEV
which have been appended to Hands-Free SLC sequence.
-> Added support to propagate the above commands and their data to
the upper layers.
Bug:
19983867
Change-Id: I93d5b2af949f9fb99507a954e623cd0927ddc976
(cherry picked from commit
e5bed64926d6ae45501617052f90932287da135b)
Jakub Pawlowski [Thu, 4 Aug 2016 00:12:50 +0000 (00:12 +0000)]
Rmove write type from GATT descriptor writes (4/4) am:
bb920a65b9
am:
bd4199ca15
Change-Id: I5e4e9fdba783959170082d0d9b65a9ddee2be070
Jakub Pawlowski [Thu, 4 Aug 2016 00:01:51 +0000 (00:01 +0000)]
Rmove write type from GATT descriptor writes (4/4)
am:
bb920a65b9
Change-Id: I9301e43850d5e97256f3eca0a47047c47757c08b