OSDN Git Service
Myles Watson [Thu, 9 May 2019 21:39:49 +0000 (14:39 -0700)]
[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05 am:
2cef3d79da am:
dbad5b2a65 am:
b4318e302a -s ours
am:
c18375ab9c -s ours
am skip reason: subject contains skip directive
Change-Id: I62b912a903fd900156210184434eed0d3d73037b
Myles Watson [Thu, 9 May 2019 20:58:26 +0000 (13:58 -0700)]
[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05 am:
2cef3d79da am:
dbad5b2a65
am:
b4318e302a -s ours
am skip reason: subject contains skip directive
Change-Id: I5439bd2d0cdcf8546a48ca5327e0f598f8c85e61
Myles Watson [Thu, 9 May 2019 20:11:31 +0000 (13:11 -0700)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05 am:
2cef3d79da
am:
dbad5b2a65
Change-Id: I14e32670ab2e0dbaa948585fe2952aecdb13b280
Myles Watson [Thu, 9 May 2019 19:35:17 +0000 (12:35 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev am:
bff76f0800 -s ours
am:
dc3ea8739a -s ours
am skip reason: subject contains skip directive
Change-Id: I976218ca4bccaff64195deccb627d3f6369b22c4
Myles Watson [Thu, 9 May 2019 19:34:36 +0000 (12:34 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
c0c3804acd -s ours
am:
3f561b74af -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb02ce20ebe2d1785d8b4b3a5596e4dfae856142
Myles Watson [Thu, 9 May 2019 19:32:16 +0000 (12:32 -0700)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
am:
2cef3d79da
Change-Id: I6af0d17305a6fbede200e3ee0e1e951f0232ff01
Myles Watson [Thu, 9 May 2019 19:31:00 +0000 (12:31 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev
am:
bff76f0800 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic0c4e506c02980debe71e25fa373d5bad2863f63
Myles Watson [Thu, 9 May 2019 19:30:32 +0000 (12:30 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
c0c3804acd -s ours
am skip reason: subject contains skip directive
Change-Id: Ia75f800491c79738150fa89028fabbe2d1c22d18
Myles Watson [Thu, 9 May 2019 19:19:21 +0000 (12:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into pi-dev
am:
c43cbc7075 -s ours
am skip reason: subject contains skip directive
Change-Id: I9693b38ac16ec7b6eeb6c6ef479a51e74ab0e09b
Myles Watson [Thu, 9 May 2019 19:12:42 +0000 (12:12 -0700)]
[automerger skipped] DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
6d9d811e1a -s ours
am skip reason: subject contains skip directive
Change-Id: I1a1fc90b0b5d15315ada952005c6290ecca3d47f
TreeHugger Robot [Thu, 9 May 2019 18:47:49 +0000 (18:47 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev
TreeHugger Robot [Thu, 9 May 2019 18:47:28 +0000 (18:47 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into pi-dev
Weichin Weng [Thu, 9 May 2019 02:54:25 +0000 (02:54 +0000)]
Merge "Close unexpected HearingAid open event if is not attempting to connect" into qt-dev
TreeHugger Robot [Wed, 8 May 2019 19:47:14 +0000 (19:47 +0000)]
Merge "A2DP: Fix offload start VSC parameters" into qt-dev
Martin Brabham [Wed, 8 May 2019 17:04:14 +0000 (10:04 -0700)]
[automerger skipped] Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3 am:
dd2e11092a am:
1a99efee01 -s ours
am:
62d14464c4 -s ours
am skip reason: subject contains skip directive
Change-Id: Idc3fbc8ff1f84825f1407e80388632d7591ad347
Martin Brabham [Wed, 8 May 2019 16:58:11 +0000 (09:58 -0700)]
[automerger skipped] Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3 am:
dd2e11092a
am:
1a99efee01 -s ours
am skip reason: subject contains skip directive
Change-Id: Id031a291948c84874a9d70b87cfe4ed57f1ed389
Martin Brabham [Wed, 8 May 2019 16:45:37 +0000 (09:45 -0700)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3
am:
dd2e11092a
Change-Id: I5dcb7baaf68e522a0604a30c53be5d61bf315a73
Martin Brabham [Wed, 8 May 2019 16:39:30 +0000 (09:39 -0700)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
am:
99a0259cf3
Change-Id: Ic593d9a4c421539181402c39860db5771a8f1417
TreeHugger Robot [Wed, 8 May 2019 16:30:02 +0000 (16:30 +0000)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
Ted Wang [Wed, 8 May 2019 05:51:52 +0000 (22:51 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours am:
d76a5a7532 -s ours am:
5d37d19091 -s ours
am:
22ce813ca2 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
1243f8da33 is in history
Change-Id: Id0f8d3d489e5b9b19697c6345bf7da7586fc894e
Ted Wang [Wed, 8 May 2019 04:59:25 +0000 (21:59 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours am:
d76a5a7532 -s ours
am:
5d37d19091 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: I7df90c8eb729337eb6d6e4425214676a9d0dc32d
Ted Wang [Wed, 8 May 2019 04:26:09 +0000 (21:26 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours
am:
d76a5a7532 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: Ic1064df1d0f2d24d74e030112040e4b53101e7ba
Ted Wang [Wed, 8 May 2019 04:06:54 +0000 (21:06 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
am:
cd20f25a79 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: I8465f167bb3054270c8ab3222835bca9096f8212
TreeHugger Robot [Wed, 8 May 2019 03:35:08 +0000 (03:35 +0000)]
Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
Ted Wang [Tue, 7 May 2019 22:30:17 +0000 (15:30 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354 am:
ee88b904c5 am:
6e197e9332 -s ours
am:
b7cbe692a1 -s ours
am skip reason: subject contains skip directive
Change-Id: If1c8417e32909db7846cf1256dbb5b19642983e1
Ted Wang [Tue, 7 May 2019 22:27:13 +0000 (15:27 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354 am:
ee88b904c5
am:
6e197e9332 -s ours
am skip reason: subject contains skip directive
Change-Id: I34a6387c4d3eb5eebe2a94b6ec84a409a6f20808
Ted Wang [Tue, 7 May 2019 22:14:26 +0000 (15:14 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354
am:
ee88b904c5
Change-Id: I1aa9a18fd7e1ccdcc89227d732a7ab758d62ae18
Ted Wang [Tue, 7 May 2019 22:01:21 +0000 (15:01 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
am:
5c82fb9354
Change-Id: Ia977c5381d95449adf2e20692c23dcd00c9b3fd9
Sal Savage [Tue, 7 May 2019 20:20:22 +0000 (20:20 +0000)]
Merge "Handling of incoming AVRCP Controller connections" into qt-dev
Martin Brabham [Tue, 7 May 2019 19:51:58 +0000 (12:51 -0700)]
[automerger skipped] DO NOT MERGE: osi: Offload mutex pointer to local scope
am:
947c58718f -s ours
am skip reason: subject contains skip directive
Change-Id: Ic551ed6e5bc89f72c7c2531dc019384d02c3ecef
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Joseph Pirozzo [Thu, 2 May 2019 23:45:03 +0000 (16:45 -0700)]
Handling of incoming AVRCP Controller connections
Resolve edge cases on incoming AVRCP Controllers Remote Controller
cases, both caused the remote control component to either generate an
out of bounds error or fail to update peer features.
Test: receive incoming AVRCP connection
Bug:
130750865
Change-Id: I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10
Merged-In: I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10
weichinweng [Sat, 4 May 2019 00:49:24 +0000 (08:49 +0800)]
Close unexpected HearingAid open event if is not attempting to connect
When HearingAid bta layer receive unexpected HearingAid open event,
should close it if is not attempting to connect.
Bug:
131863877
Test: 1.Forget/Repair HearingAid device from Bluetooth UI.
2.Disconnect/Reconnect HearingAid device from Bluetooth UI.
3.HearingAid device power off/on, check them can reconnect.
Change-Id: I75d63d0441dcc6b7338b1e30453021eb271f4872
Merged-In: I75d63d0441dcc6b7338b1e30453021eb271f4872
Satish kumar sugasi [Fri, 26 Apr 2019 02:55:31 +0000 (19:55 -0700)]
A2DP: Fix offload start VSC parameters
* Add more codec specific parameters in VSC.
* Deliver AAC parameters to the audio HAL.
Bug:
131209515
Test: manual
Change-Id: I3908abcb8f7703e4b89513ed473f6949b3c1bbe3
Merged-In: I3908abcb8f7703e4b89513ed473f6949b3c1bbe3
(cherry picked from commit
cf284d29a9eb07ed7e312def78b7e7d90da9ccf9)
Android Build Merger (Role) [Mon, 6 May 2019 05:57:02 +0000 (05:57 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
Change-Id: I12681b184de3aaff511fcf29540b6cde73bc6ac2
Android Build Merger (Role) [Mon, 6 May 2019 05:56:59 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70
Change-Id: I91346a746ce3342fc02c6a8afa82ed1904b374d7
Android Build Merger (Role) [Mon, 6 May 2019 05:56:54 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041
Change-Id: I8f91d03ebd8ce528acf076443400daed71b261aa
Android Build Merger (Role) [Mon, 6 May 2019 05:56:49 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe
Change-Id: I854858463801fabb6b21bc6af67d794387c36b3e
Android Build Merger (Role) [Mon, 6 May 2019 05:56:45 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe
Change-Id: I79d94e8ba10a1f8e5f1657eaab36eacab4c6d0fb
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Weichin Weng [Sat, 4 May 2019 00:29:51 +0000 (00:29 +0000)]
Merge "Don't read HearingAid properties if already have properties value." into qt-dev
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
(cherry picked from commit
1243f8da338dadfe2a3c281a08297b431402d41c)
Ted Wang [Fri, 3 May 2019 05:53:51 +0000 (05:53 +0000)]
Merge "Fix potential OOB read in sdpu_get_len_from_type" into qt-dev
weichinweng [Thu, 2 May 2019 07:31:33 +0000 (15:31 +0800)]
Don't read HearingAid properties if already have properties value.
When read HearingAid properties, don't read it if already have the
HearingAid properties in config file. Will use these values in config
file since these values should never change.
Bug:
128464408
Test: 1.Forget/Repair HearingAid device from Bluetooth UI.
2.Disconnect/Reconnect HearingAid device from Bluetooth UI.
3.HearingAid device power off/on, check them can reconnect.
Change-Id: Id4c30947c75f0615514075ec36c50afb58fc3f14
Merged-In: Id4c30947c75f0615514075ec36c50afb58fc3f14
Myles Watson [Fri, 22 Mar 2019 23:51:39 +0000 (16:51 -0700)]
GATT: Use a list for services in a GATT database
Iterators to list elements are not invalidated by the addition and
removal of other elements.
Bug:
128938477
Test: net_test_bta
Change-Id: I45d74a63fc6b55ece3a4af02e0cc3e1de757cc4d
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Myles Watson [Wed, 1 May 2019 18:32:19 +0000 (18:32 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
dc14eb8ba01ee20dc44bcba7b3c0a17550e756fa.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: I2c8bf4f6c41f87bd6b7b217486260da4a084e4bd
Myles Watson [Wed, 1 May 2019 18:31:46 +0000 (18:31 +0000)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
f3681c8616af4d052c410ba3e88747541a974bf5.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: If8652936eb3b24b3d1b3fded0be200bb986b70e3
Android Build Merger (Role) [Wed, 1 May 2019 18:28:23 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
Change-Id: I7751a160ac79d810e5e8f2a545f7887ab2cfe756
Android Build Merger (Role) [Wed, 1 May 2019 18:28:22 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
Change-Id: Ifc01741e99c7912c459ee9178c1c8533599df240
Android Build Merger (Role) [Wed, 1 May 2019 18:28:20 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
Change-Id: If67e79b47e46c5808dff364e9a51da247e2c82f3
Android Build Merger (Role) [Wed, 1 May 2019 18:28:18 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
Change-Id: Idd6c2e065049ae432ecc44069c4344c97e46d8de
Android Build Merger (Role) [Wed, 1 May 2019 18:28:16 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Change-Id: I1a5218347cd6039a1aa48f304a55e2cce6b5d179
Myles Watson [Wed, 1 May 2019 18:28:13 +0000 (18:28 +0000)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
edd7e731edad067fe08b0623be6b2745bf81a445.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: I78f523b930d1433e39fc900d703f2317518a8b39
Jakub Pawlowski [Wed, 24 Apr 2019 21:00:16 +0000 (23:00 +0200)]
Add workaround for "Service Changed" indications breaking server-only remotes
Test: Connect with ruwido remote when magictether service is registered
Bug:
122994857
(cherry picked from commit
fb252b47ca9478c3678532d04e777fd6f848132a)
Merged-In: Ibb2c1272bb08c7a127c8f7d37ee6a05f15618fc2
Change-Id: Ibb2c1272bb08c7a127c8f7d37ee6a05f15618fc2
TreeHugger Robot [Mon, 29 Apr 2019 23:36:29 +0000 (23:36 +0000)]
Merge "Add a persistent key to overwrite MIN_CE_LEN for Hearing Aids" into qt-dev
Stanley Tng [Sat, 27 Apr 2019 21:51:11 +0000 (14:51 -0700)]
Add a persistent key to overwrite MIN_CE_LEN for Hearing Aids
To help in debugging the noise issues on Hearing Aids, add a new
persistent key, persist.bluetooth.hearingaidmincelen, to overwrite the
MIN_CE_LEN parameter that are used for the Connection Parameter Update
operations.
Bug:
130916579
Test: Manual testing
Change-Id: I1c52b2f99235f8d88e0a1d278dbf3174f1c60709
(cherry picked from commit
4900661c4904fb28ab6b1fca591e510b7782fe5f)
Merged-In: I1c52b2f99235f8d88e0a1d278dbf3174f1c60709
Martin Brabham [Mon, 22 Apr 2019 16:33:25 +0000 (09:33 -0700)]
Revert "Revert "DO NOT MERGE: osi: Offload mutex pointer to local scope""
This reverts commit
f964b3c6817d0a400886bd103e5294bb929b7c3b.
Bug:
117997080
Test: atest net_test_bluetooth
TreeHugger Robot [Thu, 25 Apr 2019 05:36:05 +0000 (05:36 +0000)]
Merge "Call gatt_disconnect if the LE connection is not established and no APP use it." into qt-dev
weichinweng [Tue, 23 Apr 2019 02:56:20 +0000 (10:56 +0800)]
HearingAid: add addToWhiteList NativeInterface API
Add a new native interface API, addToWhiteList, that adds a LE device to
the whitelist.
Bug:
129452236
Test: Manual testing with Hearing Aids
Change-Id: I57c327380f07243e484c5c3afedfe60404f883fa
Merged-In: I57c327380f07243e484c5c3afedfe60404f883fa
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128437297
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
TreeHugger Robot [Tue, 23 Apr 2019 01:24:26 +0000 (01:24 +0000)]
Merge "HFP: Fix null pointer dereference in bta_ag_codec_negotiate()." into qt-dev
Weichin Weng [Tue, 23 Apr 2019 00:24:21 +0000 (00:24 +0000)]
Merge "Use GATT_WRITE_NO_RSP for "state change" updates" into qt-dev
weichinweng [Mon, 25 Mar 2019 05:51:10 +0000 (13:51 +0800)]
Call gatt_disconnect if the LE connection is not established and no APP use it.
When the LE connection hold APP is removed, if the LE connection is not
established and no APP use it, we never free transport control block
(p_tcb) or close it. For BLE device that have not established and no APP
use it, will call gatt_disconnect to free p_tcb and go to close state.
Bug:
127908699
Test: GattConnectTest
Change-Id: Ifed10c67141cb4c9221478db759c5614714fff30
Merged-In: Ifed10c67141cb4c9221478db759c5614714fff30
Jack He [Sun, 21 Apr 2019 00:01:53 +0000 (17:01 -0700)]
TEST: Fix net_test_stock_rfcomm unit test
* Properly mock updated L2CAP registeration method by including the
filtered btsnoop option
* Properly mock btsnoop module by creating a separate file to link with
the test executable
Fixes:
123361801
Test: atest net_test_stack_rfcomm
Change-Id: I89ca875cbcc941feddd7c501fa1b7e14f8d14794
Ray Kuo [Tue, 16 Apr 2019 13:36:23 +0000 (21:36 +0800)]
HFP: Fix null pointer dereference in bta_ag_codec_negotiate().
BTM_ReadRemoteFeatures function will return NULL if ACL link to the remote
device is disconnected. Need to check whether p_rem_feat is nullptr
before dereferencing it.
Bug:
129736080
Test: make, force BTM_ReadRemoteFeatures() to return null and perform
MT/MO call tests.
Change-Id: I28d90823340d8721ee2349d3f55f07d1e823fee3
Merged-In: I28d90823340d8721ee2349d3f55f07d1e823fee3
TreeHugger Robot [Fri, 19 Apr 2019 03:46:23 +0000 (03:46 +0000)]
Merge "btif: Short circuit NIAP key attestation check" into qt-dev
Zach Johnson [Fri, 19 Apr 2019 02:01:29 +0000 (02:01 +0000)]
Merge "Revert "DO NOT MERGE: osi: Offload mutex pointer to local scope"" into qt-dev
Zach Johnson [Fri, 19 Apr 2019 01:59:54 +0000 (01:59 +0000)]
Revert "DO NOT MERGE: osi: Offload mutex pointer to local scope"
This reverts commit
15529d316435ae977d3d578faa382bc1af89e787.
Reason for revert: causes crash at ToT
Bug:
130840078
Change-Id: Iee8a968afe385fff35f9db4e3a628f0592ee9a5b
weichinweng [Wed, 17 Apr 2019 07:52:07 +0000 (15:52 +0800)]
Use GATT_WRITE_NO_RSP for "state change" updates
For Hearing Aid, replaces the GATT_WRITE with GATT_WRITE_NO_RSP for the
"state change" updates that are send to the devices. Using no response
write is faster and these informational updates does not need a
confirmation from the devices.
Bug:
130332748
Test: 1.run unit test
2.Forget/Repair HearingAid device from Bluetooth UI.
3.Disconnect/Reconnect HearingAid device from Bluetooth UI.
4.HearingAid device power off/on, check them can reconnect.
5.Multiple click connect/disconnect from Bluetooth UI within 1 sec,
check them can reconnect.
6.One side HearingAid device power off/on when playing music, check it
can reconnect and music is work fine.
Change-Id: I55e9b4b0b8c76412e5810e1cec5d96819527d099
Merged-In: I55e9b4b0b8c76412e5810e1cec5d96819527d099
Martin Brabham [Mon, 15 Apr 2019 21:14:54 +0000 (14:14 -0700)]
btif: Short circuit NIAP key attestation check
Ensure the check always passes so bluetooth is stable.
There is a vendor code issue with keymaster having random HAL errors (-1).
Revert this change after the keystore issues are resolved.
b/
130045583
b/
130163310
Bug:
129759834
Test: atest net_test_btif
Change-Id: I65c13eb4638799ca73bc2d3d8d07cdf14a8624c7
TreeHugger Robot [Thu, 18 Apr 2019 21:15:08 +0000 (21:15 +0000)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into qt-dev
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Jakub Pawlowski [Mon, 15 Apr 2019 20:07:27 +0000 (22:07 +0200)]
Send connected callback immediately when attempting to connect to already connected device
Instead of adding the device to the connection manager, just send the
successfull connection callback.
This patch is restoring behaviour from before Connection Manager
refactor. During the refactor this behaviour was broken.
Bug:
130273570
Test: sl4a GattConnectTest
Change-Id: Ic4fa7089a8262f6f792206496a7cfb9c83a16eb2
Merged-In: Ic4fa7089a8262f6f792206496a7cfb9c83a16eb2
Myles Watson [Fri, 12 Apr 2019 21:30:51 +0000 (14:30 -0700)]
RootCanal: Open network ports only if there is a console
Fixes:
128355308
Test: toggle airplane mode and check for opening sockets
Change-Id: I8c4581b708c05a8c72dba3604c02adea97c1653b
TreeHugger Robot [Thu, 11 Apr 2019 03:37:58 +0000 (03:37 +0000)]
Merge "Change storage metadata type to byte array" into qt-dev
Jakub Pawlowski [Mon, 8 Apr 2019 13:07:10 +0000 (06:07 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours am:
e8dea68f6a -s ours am:
dc17388efd -s ours
am:
6c931823ce -s ours
am skip reason: subject contains skip directive
Change-Id: I5594c2a292a9754900e8c574cc859f51dbc4442c
Jakub Pawlowski [Mon, 8 Apr 2019 13:03:09 +0000 (06:03 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours am:
e8dea68f6a -s ours
am:
dc17388efd -s ours
am skip reason: subject contains skip directive
Change-Id: I368bf6dcf1599b50fce99a9c55fb25bc896996cb
Jakub Pawlowski [Mon, 8 Apr 2019 13:00:22 +0000 (06:00 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours
am:
e8dea68f6a -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: If68cf83db0a7388146f4e28a8433f8bd4c402e72
Jakub Pawlowski [Mon, 8 Apr 2019 12:55:18 +0000 (05:55 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
292fcf8612 -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: I923523630e1e8530f23f3720611582353ffecff4
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
Ugo Yu [Thu, 14 Mar 2019 07:32:44 +0000 (15:32 +0800)]
Change storage metadata type to byte array
Bug:
124448651
Test: runtest bluetooth
Change-Id: I10489c4aa93c2c3463456bcba210036bc20082a4
Jakub Pawlowski [Sat, 6 Apr 2019 00:30:22 +0000 (17:30 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8 am:
fc58eb3c8d am:
97e9e1540a -s ours
am:
a07ff2d7de -s ours
am skip reason: subject contains skip directive
Change-Id: I2b7882f5c6ac4790c9f32be9640743ee2471e6d4
Jakub Pawlowski [Sat, 6 Apr 2019 00:29:33 +0000 (17:29 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
054dcec1c9 -s ours
am:
1091324048 -s ours
am skip reason: subject contains skip directive
Change-Id: I3143af4a96421e245ea8fbe6ba3f887f1740603e
Jakub Pawlowski [Fri, 5 Apr 2019 23:25:51 +0000 (16:25 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8 am:
fc58eb3c8d
am:
97e9e1540a -s ours
am skip reason: subject contains skip directive
Change-Id: Ib1c23383e61d4faca8970cad71fa8f24dd2e354c
Jakub Pawlowski [Fri, 5 Apr 2019 23:23:05 +0000 (16:23 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8
am:
fc58eb3c8d
Change-Id: I346917706000054f0aee3bc3084f60e15b7a4f57
Jakub Pawlowski [Fri, 5 Apr 2019 23:03:40 +0000 (16:03 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
054dcec1c9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib7be32bd6046f7fce608fc0bef9d812ab6341b2a
Jakub Pawlowski [Fri, 5 Apr 2019 21:27:01 +0000 (14:27 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328
am:
c07f304de8
Change-Id: I20eed1aeb29a3df15251033d02fd7d5d241a28dd
Jakub Pawlowski [Fri, 5 Apr 2019 21:15:47 +0000 (14:15 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
250529d6f1 -s ours
am skip reason: subject contains skip directive
Change-Id: I0a7b5b8ff742ca1b31b35247da5b3ea3eb97ab19
Jakub Pawlowski [Tue, 2 Apr 2019 17:21:14 +0000 (19:21 +0200)]
Fix for GATT not returning disconnect callback.
Before recent refactor GATT was using the L2CAP layer to start LE
connections. Since the refactor, GATT talks directly to added
connection_manager, just like L2CAP.
L2CAP does have it's own timer for direct connections, that was
returning conneciton failure after timeout. After switching to
connection_manager, GATT no longer receives those callbacks.
This patch makes the connection_manager send the on_connection_timed_out
callback, and wire it to same handler that L2CAP layer was using before.
Test: unit tests added
Bug:
125553095
Change-Id: Iaf8be46fe8eed49f78ddbc6a2f3516bc8279e91f
Ugo Yu [Wed, 3 Apr 2019 21:11:16 +0000 (14:11 -0700)]
Merge "Handle Bluetooth HAL service died" am:
fcaed46d9e am:
5e3e0bba7c
am:
f8d4bb86d7
Change-Id: I5fd483628665f5f795e3c712943c6c62e4142e4d
TreeHugger Robot [Wed, 3 Apr 2019 19:49:20 +0000 (19:49 +0000)]
Merge "Check GATT notification len"
Ugo Yu [Wed, 3 Apr 2019 19:07:14 +0000 (12:07 -0700)]
Merge "Handle Bluetooth HAL service died" am:
fcaed46d9e
am:
5e3e0bba7c
Change-Id: I55c92c433d7f80e4a0cb21321480d0e7178d64d8
Ugo Yu [Wed, 3 Apr 2019 18:57:43 +0000 (11:57 -0700)]
Merge "Handle Bluetooth HAL service died"
am:
fcaed46d9e
Change-Id: I105aad49177d7987fd0ad97fdad9d22359fd32d6
Treehugger Robot [Wed, 3 Apr 2019 18:45:12 +0000 (18:45 +0000)]
Merge "Handle Bluetooth HAL service died"
Ugo Yu [Tue, 2 Apr 2019 13:55:14 +0000 (21:55 +0800)]
Handle Bluetooth HAL service died
Bug:
129320921
Test: kill Bluetooth HAL
Change-Id: I83c897f5a9def52b2050a3e73d97f99b1b71aa3b
TreeHugger Robot [Wed, 3 Apr 2019 12:56:11 +0000 (12:56 +0000)]
Merge "Fix handling of startup_timer_expired"
Sunny Kapdi [Sat, 30 Mar 2019 00:42:38 +0000 (17:42 -0700)]
Fix handling of startup_timer_expired
1. The startup_timer needs to be less than
3 sec to allow the wakelock to be held by
the stack and needs to be less than the
BLE_START_TIMEOUT of framework.
2. On expiry of startup_timer, just abort
as there is no proper recovery steps here.
Bug:
129394377
Change-Id: I1a397bab5c88fe7ef8ccbc369897903ee5d0a36a
Myles Watson [Wed, 3 Apr 2019 05:16:40 +0000 (22:16 -0700)]
Merge "RootCanal: Add beacons by default" am:
ca152a6705 am:
f0aeea3cd3
am:
d22e75eae1
Change-Id: I679da68b02f40560efec19ffdaf8f81454a76651
OSDN Git Service
