OSDN Git Service

android-x86/system-bt.git
7 years agoSynchronize the code with AOSP am: 5d712cfde6
Pavlin Radoslavov [Wed, 17 Aug 2016 04:21:32 +0000 (04:21 +0000)]
Synchronize the code with AOSP am: 5d712cfde6
am: 8dd79539ae

Change-Id: Ibcedd89828ca63b9aaa8233226fa1ccd600f7f32

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 04:20:08 +0000 (04:20 +0000)]
Synchronize the code with AOSP
am: 5d712cfde6

Change-Id: I47e0c1d5518c7bf799cd527abfc5bf20bfba9e7f

7 years agoMerge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp
TreeHugger Robot [Wed, 17 Aug 2016 04:15:14 +0000 (04:15 +0000)]
Merge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp

7 years agoSynchronize the code with the internal tree am: 55f82cd30f am: 8f4fb98c7e
Pavlin Radoslavov [Wed, 17 Aug 2016 04:10:31 +0000 (04:10 +0000)]
Synchronize the code with the internal tree am: 55f82cd30f am: 8f4fb98c7e
am: db92f4d323

Change-Id: I92c6f954eddbf7170483045ba67ae054302df14b

7 years agoSynchronize the code with the internal tree am: 55f82cd30f
Pavlin Radoslavov [Wed, 17 Aug 2016 04:09:09 +0000 (04:09 +0000)]
Synchronize the code with the internal tree am: 55f82cd30f
am: 8f4fb98c7e

Change-Id: Ida73caa1f443b8f5d32a49e884e8aa1623f7684d

7 years agoSynchronize the code with the internal tree
Pavlin Radoslavov [Wed, 17 Aug 2016 04:05:32 +0000 (04:05 +0000)]
Synchronize the code with the internal tree
am: 55f82cd30f

Change-Id: I0e7041e39efad3e51638091e1f9e9b24b8a4176c

7 years agoRandomize allocation canary am: 4980fab05c
Marie Janssen [Wed, 17 Aug 2016 03:57:04 +0000 (03:57 +0000)]
Randomize allocation canary am: 4980fab05c
am: 74132bf9f4

Change-Id: I58ba08ef437134260bde913354c5ed3aa0cc04a2

7 years agoRandomize allocation canary
Marie Janssen [Wed, 17 Aug 2016 03:54:00 +0000 (03:54 +0000)]
Randomize allocation canary
am: 4980fab05c

Change-Id: Id70d37e6c62b393b02bae32743e2acc20334341d

7 years agoRandomize allocation canary
Marie Janssen [Fri, 4 Mar 2016 01:50:26 +0000 (17:50 -0800)]
Randomize allocation canary

A static allocation canary can be susceptible to buffer overflow
exploit code bypassing, so this randomizes it on every run.

Bug: 27411268
Change-Id: I81b06f89951a012c08d846042653ec957f3e9127
(cherry picked from commit 7c054350fb7da9da1fdb86e7f7b9a801cf1c39e4)

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 02:52:49 +0000 (19:52 -0700)]
Synchronize the code with AOSP

Minor spacing fixes.

Change-Id: Id29171cea320265ede96520feb39fc8929bbaddc

7 years agoSynchronize the code with the internal tree
Pavlin Radoslavov [Wed, 17 Aug 2016 02:42:16 +0000 (19:42 -0700)]
Synchronize the code with the internal tree

Spacing, line split, etc.

Change-Id: I781e771e93b104bbc044d1646106c19d8af55e7b

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 02:35:51 +0000 (19:35 -0700)]
Synchronize the code with AOSP

Minor edits - spacing, etc.

Change-Id: I172d64585e82c23789fbad17e7366bbc55a9e50d

7 years agoMerge "Fix a typo in pre-compiler error message" am: 7cc80100e1 am: 8461b92874
Glenn Kasten [Wed, 17 Aug 2016 01:55:19 +0000 (01:55 +0000)]
Merge "Fix a typo in pre-compiler error message" am: 7cc80100e1 am: 8461b92874
am: f8e28f2339

Change-Id: I9bb7e7163097573e81d662afe9bc192044310649

7 years agoMerge "Fix a typo in pre-compiler error message" am: 7cc80100e1
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

7 years agoMerge "Fix a typo in pre-compiler error message"
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

7 years agoMerge "Fix a typo in pre-compiler error message"
Treehugger Robot [Wed, 17 Aug 2016 01:44:34 +0000 (01:44 +0000)]
Merge "Fix a typo in pre-compiler error message"

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7 am: 765dcf9c6f
Andre Eisenbach [Wed, 17 Aug 2016 01:19:54 +0000 (01:19 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7 am: 765dcf9c6f
am: 70f6f3296e

Change-Id: I05fe311f7ae3cae3896fa682c34ddde1aac11c5a

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7
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

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist
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

7 years agoFix a typo in pre-compiler error message
Glenn Kasten [Tue, 8 Mar 2016 20:11:38 +0000 (12:11 -0800)]
Fix a typo in pre-compiler error message

Change-Id: Ia584c748ea065739e0f6df1ea8a86df517a257af

7 years agoDisable 3Mbps packets for AVDT ACL links am: f527ce28b4 -s ours am: d0ca1d1483
Sathya Kumar [Wed, 17 Aug 2016 00:04:48 +0000 (00:04 +0000)]
Disable 3Mbps packets for AVDT ACL links am: f527ce28b4  -s ours am: d0ca1d1483
am: c989d41c7b

Change-Id: I66fd74be8f5e2e8a74f25d9c942ae587ddf8a65e

7 years agoDisable 3Mbps packets for AVDT ACL links am: f527ce28b4 -s ours
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

7 years agoDisable 3Mbps packets for AVDT ACL links
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

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist
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)

7 years agoresolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2
Sathya Kumar [Tue, 16 Aug 2016 22:39:44 +0000 (22:39 +0000)]
resolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2
am: 218d3df09a

Change-Id: I6e516cb2bcac807c917dc6a22ab13a81b229bb69

7 years agoresolve merge conflicts of 37119da to stage-aosp-master
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

7 years agoDisable 3Mbps packets for AVDT ACL links
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

7 years agoresolve merge conflicts of 37119da to stage-aosp-master
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)

7 years agoUse C++ style std::string instead of C-style string am: d97874240b
Pavlin Radoslavov [Tue, 16 Aug 2016 21:04:08 +0000 (21:04 +0000)]
Use C++ style std::string instead of C-style string am: d97874240b
am: f48fcc7628

Change-Id: I0dc74978bede1f36575438855cd0da344c68e733

7 years agoUse C++ style std::string instead of C-style string
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

7 years agoUse C++ style std::string instead of C-style string
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

7 years agoMerge "Make default SBC bitrate configurable by device." am: 57e911ea25 am: a918f41b60
Sridhar Vashist [Tue, 16 Aug 2016 10:29:26 +0000 (10:29 +0000)]
Merge "Make default SBC bitrate configurable by device." am: 57e911ea25 am: a918f41b60
am: 215705173a

Change-Id: I1264c273d0ec23fde2c5760eb9c2f08f12e7c94b

7 years agoMerge "Make default SBC bitrate configurable by device." am: 57e911ea25
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

7 years agoMerge "Make default SBC bitrate configurable by device."
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

7 years agoMerge "Make default SBC bitrate configurable by device."
Treehugger Robot [Tue, 16 Aug 2016 10:15:01 +0000 (10:15 +0000)]
Merge "Make default SBC bitrate configurable by device."

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am...
Sridhar Vashist [Tue, 16 Aug 2016 09:52:04 +0000 (09:52 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am: 21a7e48c0f am: 0c1fffb857
am: f0b8a62c10

Change-Id: I2fbdfc806364cbd2c2fef85154922735cf106588

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am...
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

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
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

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
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."

7 years agoMake default SBC bitrate configurable by device.
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)

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676...
ugo_yu [Tue, 16 Aug 2016 08:38:30 +0000 (08:38 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676 am: a430cc3b4e
am: 527f48d729

Change-Id: I766d4f2795da34b6ef6ba72bf1a7a014ba754b00

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676
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

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed"
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

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed"
Treehugger Robot [Tue, 16 Aug 2016 08:22:56 +0000 (08:22 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed"

7 years agoAlways send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.
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)

7 years agoMerge "Check size of pin before replying" am: 545ac907dd am: e4047a70e5
Marie Janssen [Tue, 16 Aug 2016 07:49:27 +0000 (07:49 +0000)]
Merge "Check size of pin before replying" am: 545ac907dd am: e4047a70e5
am: 6cbf37a2e2

Change-Id: Ia1adba7a4c76ac49e3d7d0c9e598cf97cc594f83

7 years agoMerge "Check size of pin before replying" am: 545ac907dd
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

7 years agoMerge "Check size of pin before replying"
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

7 years agoMerge "Check size of pin before replying"
Treehugger Robot [Tue, 16 Aug 2016 07:35:18 +0000 (07:35 +0000)]
Merge "Check size of pin before replying"

7 years agoaudio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8 am: 8d3142f759
Andy Hung [Tue, 16 Aug 2016 07:32:56 +0000 (07:32 +0000)]
audio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8 am: 8d3142f759
am: 3992d3f29e

Change-Id: Ic48b03608190ab16bc3ec4ca91811f329ff1d36a

7 years agoaudio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8
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

7 years agoaudio_a2dp_hw: Always update frame counter in out_write
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

7 years agoGATT: Deregister notification when a GATT connection is closed
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)

7 years agoCheck size of pin before replying
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)

7 years agoRemove SBC frame scrambling am: 7fcea70080 am: 3753c01648
Andre Eisenbach [Tue, 16 Aug 2016 05:54:50 +0000 (05:54 +0000)]
Remove SBC frame scrambling am: 7fcea70080 am: 3753c01648
am: 38f68ec028

Change-Id: I3b0a0e0d9b94d9e270f2acfdec7e20ffa3eb8317

7 years agoaudio_a2dp_hw: Always update frame counter in out_write
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)

7 years agoRemove SBC frame scrambling am: 7fcea70080
Andre Eisenbach [Tue, 16 Aug 2016 05:50:50 +0000 (05:50 +0000)]
Remove SBC frame scrambling am: 7fcea70080
am: 3753c01648

Change-Id: I2c45a530f9244c87598cd4c2c7e0d716bdf551a5

7 years agoRemove SBC frame scrambling
Andre Eisenbach [Tue, 16 Aug 2016 05:46:52 +0000 (05:46 +0000)]
Remove SBC frame scrambling
am: 7fcea70080

Change-Id: If59587ff211e5ce378e4258aabcb7a32774553a9

7 years agoRemove SBC frame scrambling
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)

7 years agoMerge "New status code for two SMP authorization failures" am: b29732059e am: 734ba5b0a8
Jacky Cheung [Tue, 16 Aug 2016 03:48:14 +0000 (03:48 +0000)]
Merge "New status code for two SMP authorization failures" am: b29732059e am: 734ba5b0a8
am: 90758fafdc

Change-Id: I50c34278d8d4608ca0bbb6b62954088f4bfebf78

7 years agoHID: Check for EINTR in uhid_event() and fix return value evaluation am: acb093ada7...
Andre Eisenbach [Tue, 16 Aug 2016 03:48:13 +0000 (03:48 +0000)]
HID: Check for EINTR in uhid_event() and fix return value evaluation am: acb093ada7 am: a319edc546
am: 5b2c72eead

Change-Id: Idfc7c9a9516abdc539c29d23a7f781b2cb556495

7 years agoMerge "New status code for two SMP authorization failures" am: b29732059e
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

7 years agoHID: Check for EINTR in uhid_event() and fix return value evaluation am: acb093ada7
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

7 years agoMerge "New status code for two SMP authorization failures"
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

7 years agoHID: Check for EINTR in uhid_event() and fix return value evaluation
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

7 years agoMerge "New status code for two SMP authorization failures"
Treehugger Robot [Tue, 16 Aug 2016 03:37:09 +0000 (03:37 +0000)]
Merge "New status code for two SMP authorization failures"

7 years agoNew 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)

7 years agoRemoved bogus leftover code that wasn't auto-merged properly am: 3c48d11354
Pavlin Radoslavov [Tue, 16 Aug 2016 01:38:10 +0000 (01:38 +0000)]
Removed bogus leftover code that wasn't auto-merged properly am: 3c48d11354
am: 6164fd76ce

Change-Id: I88bd466cb7ef479287428517a999837ac681b6ab

7 years agoRemoved bogus leftover code that wasn't auto-merged properly
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

7 years agoRemoved bogus leftover code that wasn't auto-merged properly
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

7 years agoRefactor vendor library to use async manager class am: 0b32c8d8c1 am: db7cab56f9
Jorge E. Moreira [Mon, 15 Aug 2016 21:29:21 +0000 (21:29 +0000)]
Refactor vendor library to use async manager class am: 0b32c8d8c1 am: db7cab56f9
am: 3cce4689e4

Change-Id: I527f1afb94ce30cfffeae6f0e709f0b458d77482

7 years agoAdded the async manager am: 08c214154d am: d87ecf6aed
Jorge E. Moreira [Mon, 15 Aug 2016 21:29:20 +0000 (21:29 +0000)]
Added the async manager am: 08c214154d am: d87ecf6aed
am: f96a36b919

Change-Id: Ic4917a287c98a0baee2cb31ff08c1c9bc1528c8c

7 years agoRefactor vendor library to use async manager class am: 0b32c8d8c1
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

7 years agoAdded the async manager am: 08c214154d
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

7 years agoAdded missing #include directives am: 65ee728284 am: 9d427f118f
Jorge E. Moreira [Mon, 15 Aug 2016 21:21:34 +0000 (21:21 +0000)]
Added missing #include directives am: 65ee728284 am: 9d427f118f
am: fc063b9947

Change-Id: Ib0a58d7281afb1cb164fc4a05a873e5a05d0c7f5

7 years agoRefactor vendor library to use async manager class
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

7 years agoAdded the async manager
Jorge E. Moreira [Mon, 15 Aug 2016 21:21:23 +0000 (21:21 +0000)]
Added the async manager
am: 08c214154d

Change-Id: I583d351023846be861018cd67f5410a50d98a12a

7 years agoAdded missing #include directives am: 65ee728284
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

7 years agoHID: Check for EINTR in uhid_event() and fix return value evaluation
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)

7 years agoRefactor vendor library to use async manager class
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

7 years agoAdded missing #include directives
Jorge E. Moreira [Mon, 15 Aug 2016 21:13:38 +0000 (21:13 +0000)]
Added missing #include directives
am: 65ee728284

Change-Id: I5b293b7ff4665312efdf1bcc00a6f2f5058d2670

7 years agoAdded the async manager
Jorge E. Moreira [Mon, 8 Aug 2016 18:39:52 +0000 (11:39 -0700)]
Added the async manager

Change-Id: I968fee42fd610e33e13bf358f54bec1fe7af4a7d

7 years agoReplace calls to std::bind by lambda expressions am: 97980c25a1 am: 20641629e6
Jorge E. Moreira [Mon, 15 Aug 2016 21:09:18 +0000 (21:09 +0000)]
Replace calls to std::bind by lambda expressions am: 97980c25a1 am: 20641629e6
am: 36e0c963cf

Change-Id: I1360fcb641d10d62ea5f6b22e74013363ef63ee9

7 years agoAdded missing #include directives
Jorge E. Moreira [Tue, 9 Aug 2016 22:21:01 +0000 (15:21 -0700)]
Added missing #include directives

Change-Id: Ia26cd6775699c65a75d94003c09730926835f7a3

7 years agoReplace calls to std::bind by lambda expressions am: 97980c25a1
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

7 years agoReplace calls to std::bind by lambda expressions
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

7 years agoNo longer uses the macro DISALLOW_COPY_AND_ASSIGN am: 83cf95e0a1 am: ece79cdeac
Jorge E. Moreira [Mon, 15 Aug 2016 19:26:11 +0000 (19:26 +0000)]
No longer uses the macro DISALLOW_COPY_AND_ASSIGN am: 83cf95e0a1 am: ece79cdeac
am: 75fcf00b10

Change-Id: I21afa13b88c1cd4c1674d8839f1fc2437be74fef

7 years agoUsing include paths relative to vendor library dir am: ea3ede2474 am: c7dd1eae5e
Jorge E. Moreira [Mon, 15 Aug 2016 19:26:10 +0000 (19:26 +0000)]
Using include paths relative to vendor library dir am: ea3ede2474 am: c7dd1eae5e
am: 7a57fc97ae

Change-Id: I3251f48f6eee2d0dad2752bc67926fcab6b1665d

7 years agoNo longer uses the macro DISALLOW_COPY_AND_ASSIGN am: 83cf95e0a1
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

7 years agoUsing include paths relative to vendor library dir am: ea3ede2474
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

7 years agoNo longer uses the macro DISALLOW_COPY_AND_ASSIGN
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

7 years agoUsing include paths relative to vendor library dir
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

7 years agoReplace calls to std::bind by lambda expressions
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

7 years agoNo longer uses the macro DISALLOW_COPY_AND_ASSIGN
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

7 years agoUsing include paths relative to vendor library dir
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

7 years agoMerge "Improve BT HAL write response to BT server reads" am: f65e83e5b1 am: 268069aab8
Andy Hung [Mon, 15 Aug 2016 18:29:07 +0000 (18:29 +0000)]
Merge "Improve BT HAL write response to BT server reads" am: f65e83e5b1 am: 268069aab8
am: 6df9f22c0d

Change-Id: I6426e73e02ea8f5b05719a0efc773f1d197dd333

7 years agoMerge "Improve BT HAL write response to BT server reads" am: f65e83e5b1
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

7 years agoMerge "Improve BT HAL write response to BT server reads"
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

7 years agoMerge "Improve BT HAL write response to BT server reads"
Treehugger Robot [Mon, 15 Aug 2016 18:15:31 +0000 (18:15 +0000)]
Merge "Improve BT HAL write response to BT server reads"

7 years agoSeparate the Alarm unit tests from testing the Wakelocks am: 223cecf8b6 am: 246d21b152
Pavlin Radoslavov [Mon, 15 Aug 2016 18:07:35 +0000 (18:07 +0000)]
Separate the Alarm unit tests from testing the Wakelocks am: 223cecf8b6 am: 246d21b152
am: 4934a005fd

Change-Id: Ibecbd39645ad49d205471bdf1027ae6dd85f4301