OSDN Git Service
Pavlin Radoslavov [Fri, 24 Feb 2017 01:09:36 +0000 (01:09 +0000)]
Merge "Update the AAC bitrate settings" am:
13f4c4d474 am:
286a60387d
am:
9b17bbec3d
Change-Id: I18a4f2f1b6968aa534240d71129da365e02df1db
Pavlin Radoslavov [Fri, 24 Feb 2017 01:07:05 +0000 (01:07 +0000)]
Merge "Update the AAC bitrate settings" am:
13f4c4d474
am:
286a60387d
Change-Id: I9c1493a570507a4a33b59810e41925e86219dbaa
Pavlin Radoslavov [Fri, 24 Feb 2017 01:04:40 +0000 (01:04 +0000)]
Merge "Update the AAC bitrate settings"
am:
13f4c4d474
Change-Id: I2bea4a4bb701f2e6cbc4791446d78801482b442f
Treehugger Robot [Fri, 24 Feb 2017 01:01:15 +0000 (01:01 +0000)]
Merge "Update the AAC bitrate settings"
Jakub Pawlowski [Fri, 24 Feb 2017 00:59:36 +0000 (00:59 +0000)]
Display passkey when bonding am:
197a1b99e5 am:
183c0440c8
am:
bc67820b0d
Change-Id: I0e70a78e9f62824c824935ccf0090d83222eff63
Jakub Pawlowski [Fri, 24 Feb 2017 00:57:35 +0000 (00:57 +0000)]
Display passkey when bonding am:
197a1b99e5
am:
183c0440c8
Change-Id: Ic8a626c68032842b71b132f05a613ba9c9134749
Jakub Pawlowski [Fri, 24 Feb 2017 00:55:08 +0000 (00:55 +0000)]
Display passkey when bonding
am:
197a1b99e5
Change-Id: If3756ba5ac9bee99116e8845806826aaa3e80076
Jakub Pawlowski [Thu, 23 Feb 2017 22:43:08 +0000 (14:43 -0800)]
Display passkey when bonding
Test: manual
Change-Id: I238dfadf401b90d52caa4c381ea068b48091c092
Jakub Pawlowski [Fri, 24 Feb 2017 00:23:31 +0000 (00:23 +0000)]
Merge "Clear state mask when scan stopped" am:
6f77461775 am:
a59ec30437
am:
8916355b89
Change-Id: I2f74d6404a18de82d4168532c1d161828d8af911
Jakub Pawlowski [Fri, 24 Feb 2017 00:20:01 +0000 (00:20 +0000)]
Merge "Clear state mask when scan stopped" am:
6f77461775
am:
a59ec30437
Change-Id: Ieaf3c1a880572052eaff15d5aa03315cbc19cef8
Jakub Pawlowski [Fri, 24 Feb 2017 00:17:33 +0000 (00:17 +0000)]
Merge "Clear state mask when scan stopped"
am:
6f77461775
Change-Id: I628ce848b48928f2da2b04befbaaf7d8b021d35b
Treehugger Robot [Fri, 24 Feb 2017 00:14:26 +0000 (00:14 +0000)]
Merge "Clear state mask when scan stopped"
Pavlin Radoslavov [Thu, 23 Feb 2017 21:49:54 +0000 (13:49 -0800)]
Update the AAC bitrate settings
Use AACENC_PEAK_BITRATE to limit the maximum bitrate as limited by
the MTU, and use AACENC_BITRATE to set the encoder bitrate.
Previously, both were set to the same value. That was disabling
the AAC bitreservoir, and eventually affecting the audio quality.
Bug:
35715570
Test: A2DP streaming to various devices
Change-Id: I6adac4889f9b2d7509182df8961ddfada02ee8ac
Bluetooth Build Test [Thu, 23 Feb 2017 22:58:27 +0000 (22:58 +0000)]
Don't build vendor lib on Linux am:
3eadf272be am:
4095ae7196
am:
569cde159c
Change-Id: I2e8030b0171f21ac9fe4daa173206c8899069596
Bluetooth Build Test [Thu, 23 Feb 2017 22:55:55 +0000 (22:55 +0000)]
Don't build vendor lib on Linux am:
3eadf272be
am:
4095ae7196
Change-Id: Id3ca53009349320c7316fdfa8cf89cb4374ea465
Bluetooth Build Test [Thu, 23 Feb 2017 22:53:56 +0000 (22:53 +0000)]
Don't build vendor lib on Linux
am:
3eadf272be
Change-Id: I1eb9b9e320de0f624a585fc7668969cc8a56ffd8
Bluetooth Build Test [Wed, 22 Feb 2017 19:52:30 +0000 (11:52 -0800)]
Don't build vendor lib on Linux
The stack does no longer use vendor libs. We use hci_layer_linux.cc now.
Test: manual
Change-Id: I6c64337280c073647faf0bd775d75c5d700e7911
Jakub Pawlowski [Thu, 23 Feb 2017 21:55:02 +0000 (13:55 -0800)]
Clear state mask when scan stopped
Test: manual test
Change-Id: Icc47679aaba92afd7f3eab48416065d3a741a745
Jakub Pawlowski [Thu, 23 Feb 2017 19:44:45 +0000 (19:44 +0000)]
Log which advertising HCI interface is used am:
9bb5a64390 am:
c69f0c926d
am:
8b286e4066
Change-Id: I01efb2babbd4b7bac01841b76061a2a3b07db736
Jakub Pawlowski [Thu, 23 Feb 2017 19:41:41 +0000 (19:41 +0000)]
Log which advertising HCI interface is used am:
9bb5a64390
am:
c69f0c926d
Change-Id: I6ad4d5aab0a0d5b91ce1d24c2a4c39152769a482
Jakub Pawlowski [Thu, 23 Feb 2017 19:39:14 +0000 (19:39 +0000)]
Log which advertising HCI interface is used
am:
9bb5a64390
Change-Id: I25376b92d1d4b51c5c99823a62660b181a34d2a1
Jakub Pawlowski [Thu, 23 Feb 2017 17:50:31 +0000 (09:50 -0800)]
Log which advertising HCI interface is used
This is useful for debugging advertising issues.
Test: manual
Change-Id: Ia51eccb1ff7922a5864572a89e77404299965862
Pavlin Radoslavov [Thu, 23 Feb 2017 18:35:08 +0000 (18:35 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening" am:
06a384fde6 am:
220ad33802
am:
3b0240cbc9
Change-Id: Ib2c3b705de66904e302994f562449f77d1c8d027
Pavlin Radoslavov [Thu, 23 Feb 2017 18:32:38 +0000 (18:32 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening" am:
06a384fde6
am:
220ad33802
Change-Id: I24a89516528b5d9e4dd0cab2611f3750c097cf23
Pavlin Radoslavov [Thu, 23 Feb 2017 18:30:38 +0000 (18:30 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening"
am:
06a384fde6
Change-Id: I6924175127d046ffd77d3215c32089ea69df158f
Treehugger Robot [Thu, 23 Feb 2017 18:26:03 +0000 (18:26 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening"
Jakub Pawlowski [Thu, 23 Feb 2017 17:34:36 +0000 (17:34 +0000)]
Fix stack shutdown on Linux am:
8342d95fa5 am:
5730be777f
am:
b47cd361a0
Change-Id: I8da65b3e2a49fb1bd6e40459b3edfdb592f2c7a5
Jakub Pawlowski [Thu, 23 Feb 2017 17:33:04 +0000 (17:33 +0000)]
Fix stack shutdown on Linux am:
8342d95fa5
am:
5730be777f
Change-Id: I507c7793ee0b1d42095860d2fe2ed16cae4a05fd
Jakub Pawlowski [Thu, 23 Feb 2017 17:31:05 +0000 (17:31 +0000)]
Fix stack shutdown on Linux
am:
8342d95fa5
Change-Id: I11181cab2c052a9a011348ca2820b8e88de484a6
Jakub Pawlowski [Thu, 23 Feb 2017 01:14:29 +0000 (17:14 -0800)]
Fix stack shutdown on Linux
Right now, hci_close() is getting stuck on stopping the reader thread.
In order to fix that, we must have a way to exit the blocking read when
shutting down the stack.
Test: manual
Change-Id: I3a7eeef6d8ed223fc96ba9eeacca37006a5c9739
Pavlin Radoslavov [Thu, 23 Feb 2017 06:07:17 +0000 (22:07 -0800)]
Close leftover Audio-to-Bluetooth HAL connections before reopening
If the Audio-to-Bluetooth HAL reopens a connection on the Data or
Control channel without closing first the old one, the UIPC select(2)
loop gets confused and could spin with 100% CPU usage.
Now we check for channels that are reopened, and explicitly close
them before reopening.
Also, fix a check whether a file descriptor is valid: 0 is a valid
file descriptor.
Test: A2DP testing with a headset: connect/play/stop
Bug:
35394629
Change-Id: I7ae988ac77f25da56e59e347363e7c473e7f69a9
Myles Watson [Thu, 23 Feb 2017 12:08:48 +0000 (12:08 +0000)]
Merge "test_vendor: Return success for no-ops" am:
e770da5966 am:
1352a15d95
am:
2e5c15974e
Change-Id: I332b476de627583c60d3a43f781fe136f9046fc9
Myles Watson [Thu, 23 Feb 2017 12:06:48 +0000 (12:06 +0000)]
Merge "test_vendor: Return success for no-ops" am:
e770da5966
am:
1352a15d95
Change-Id: Idde19d2448939bb9da9432f361478b7ddcc3cda7
Myles Watson [Thu, 23 Feb 2017 12:04:48 +0000 (12:04 +0000)]
Merge "test_vendor: Return success for no-ops"
am:
e770da5966
Change-Id: Idab0d0c1f0eb716eb954ecc02f0a100c24c28048
Treehugger Robot [Thu, 23 Feb 2017 12:01:32 +0000 (12:01 +0000)]
Merge "test_vendor: Return success for no-ops"
Jakub Pawlowski [Wed, 22 Feb 2017 23:44:26 +0000 (23:44 +0000)]
HCI for Linux am:
9329b8effa am:
973587167b
am:
9652eddcee
Change-Id: I5152dbbc7b4cc68e371e1fbb990d39f0416bd0f4
Jakub Pawlowski [Wed, 22 Feb 2017 23:44:14 +0000 (23:44 +0000)]
Move Android specific HCI code into separate file am:
32fbec6a86 am:
c87cb4c098
am:
4528b07992
Change-Id: I01be21f34e83c30280582c740f55e2c282c5d1d6
Jakub Pawlowski [Wed, 22 Feb 2017 23:33:11 +0000 (23:33 +0000)]
HCI for Linux am:
9329b8effa
am:
973587167b
Change-Id: I44b577fa4733f30e0262a9aacae58c0b9ccb6ecc
Jakub Pawlowski [Wed, 22 Feb 2017 23:33:02 +0000 (23:33 +0000)]
Move Android specific HCI code into separate file am:
32fbec6a86
am:
c87cb4c098
Change-Id: Ie983b0868454c3addbb496a11f7458f84dd8be7d
Jakub Pawlowski [Wed, 22 Feb 2017 23:30:04 +0000 (23:30 +0000)]
HCI for Linux
am:
9329b8effa
Change-Id: Ifd7919db1c605a5fe2ba9603b8ca5536b67a1474
Jakub Pawlowski [Wed, 22 Feb 2017 23:29:54 +0000 (23:29 +0000)]
Move Android specific HCI code into separate file
am:
32fbec6a86
Change-Id: I2483d6849534efd3c752a360c9939ecad8b7fb59
Jakub Pawlowski [Tue, 21 Feb 2017 22:55:21 +0000 (14:55 -0800)]
HCI for Linux
Test: manual
Change-Id: I7183c4773ae409f63296bd3c53a02ec2a460f021
Jakub Pawlowski [Tue, 21 Feb 2017 21:28:10 +0000 (13:28 -0800)]
Move Android specific HCI code into separate file
Test: manual
Change-Id: I0a99e528acaa1adec39425b7bf6f8d8b5c024632
Jakub Pawlowski [Wed, 22 Feb 2017 21:04:46 +0000 (21:04 +0000)]
Fix stack crash after bonding am:
71a58bdcf0 am:
18843a9aac
am:
3a2edf0f19
Change-Id: I67eefd6f6b7c565bcf92d2f54f069f41aeb1a815
Jakub Pawlowski [Wed, 22 Feb 2017 21:02:57 +0000 (21:02 +0000)]
Fix stack crash after bonding am:
71a58bdcf0
am:
18843a9aac
Change-Id: I549651268e6ce1538571f6153b45adfb48cde4da
Jakub Pawlowski [Wed, 22 Feb 2017 21:00:48 +0000 (21:00 +0000)]
Fix stack crash after bonding
am:
71a58bdcf0
Change-Id: Ic4cb6957bc082185e8d340e65b2519b9a670edcf
Jakub Pawlowski [Wed, 22 Feb 2017 18:34:45 +0000 (10:34 -0800)]
Fix stack crash after bonding
delayed_auth_timer_ent was freed and re-created during it's execution.
Instead of re-creating, just cancel the timers in smp_cb_cleanup.
Test: manual, bond with HID device on linux
Bug:
34083285
Change-Id: Ie569666846db5dcb2466cff00665b2c1490d7d10
Chih-Hung Hsieh [Wed, 22 Feb 2017 00:10:36 +0000 (00:10 +0000)]
Use email address in OWNERS files. am:
bd93e0a919 am:
6a22310128
am:
163fbc24d4
Change-Id: I5e6b1223e104f82d7f9d393c10f36395f1fa7dec
Chih-Hung Hsieh [Tue, 21 Feb 2017 23:49:05 +0000 (23:49 +0000)]
Use email address in OWNERS files. am:
bd93e0a919
am:
6a22310128
Change-Id: I180dd563b402f8273992dab719eec42617d01253
Chih-Hung Hsieh [Tue, 21 Feb 2017 23:47:04 +0000 (23:47 +0000)]
Use email address in OWNERS files.
am:
bd93e0a919
Change-Id: Ib1c255b055be24761537b5d64a373bd71027b53a
Chih-Hung Hsieh [Tue, 21 Feb 2017 21:48:52 +0000 (13:48 -0800)]
Use email address in OWNERS files.
Bug:
33166666
Test: default build targets
Change-Id: Id2b579215291cb1f6ae03ebc167f07bd59713dc4
Jakub Pawlowski [Tue, 21 Feb 2017 20:01:51 +0000 (20:01 +0000)]
Linux build fix am:
a386df9ac1 am:
554e32705f
am:
5ef82c45e0
Change-Id: If2925149ed909e673f350f833e9166da59b01fc8
Jakub Pawlowski [Tue, 21 Feb 2017 19:56:55 +0000 (19:56 +0000)]
Linux build fix am:
a386df9ac1
am:
554e32705f
Change-Id: I9200f6dbb6ef6b507296a54218cec8cc6134a141
Jakub Pawlowski [Tue, 21 Feb 2017 19:54:50 +0000 (19:54 +0000)]
Linux build fix
am:
a386df9ac1
Change-Id: I20be84e3405cb884370868b438a3b3eb2b0f353b
Jakub Pawlowski [Mon, 20 Feb 2017 19:15:32 +0000 (20:15 +0100)]
Linux build fix
Test: build on linux
Change-Id: I21d613fb3e914949d3e8e8fcdae60e620e685394
Jakub Pawlowski [Tue, 21 Feb 2017 19:36:12 +0000 (19:36 +0000)]
Compile audio codec libraries on linux am:
eff4dd5208 am:
17dbdf1c71
am:
beddc79b78
Change-Id: Ic164a3e8878df27d08b525d9c2595576dfc9f96b
Jakub Pawlowski [Tue, 21 Feb 2017 19:27:54 +0000 (19:27 +0000)]
Compile audio codec libraries on linux am:
eff4dd5208
am:
17dbdf1c71
Change-Id: Ic3334ce0e66efc62ce5fd983deafa423b06a647a
Jakub Pawlowski [Tue, 21 Feb 2017 19:22:31 +0000 (19:22 +0000)]
Compile audio codec libraries on linux
am:
eff4dd5208
Change-Id: Id36b22b07f122dbb5986970ade585e4b57eb596e
Jakub Pawlowski [Mon, 20 Feb 2017 19:18:51 +0000 (20:18 +0100)]
Compile audio codec libraries on linux
Test: build on linux
Change-Id: I72c7621fde1f229e3dd2a8cfa0cf0339e601914c
Jakub Pawlowski [Tue, 21 Feb 2017 18:19:31 +0000 (18:19 +0000)]
Merge changes from topic 'ble_scanner_callbacks' am:
a77f83eddd am:
c89a67ed45
am:
aa03934663
Change-Id: I6b6a21283865cfd103d9ccaa19db853678a6765f
Jakub Pawlowski [Tue, 21 Feb 2017 18:19:25 +0000 (18:19 +0000)]
Remove unnecessary extern declarations am:
96ad0d2596 am:
1eb53e9a06
am:
dadcaa4518
Change-Id: I04e3728a3381b2699df35b47aeaba0d5931cbcc3
Jakub Pawlowski [Tue, 21 Feb 2017 18:14:10 +0000 (18:14 +0000)]
Merge changes from topic 'ble_scanner_callbacks' am:
a77f83eddd
am:
c89a67ed45
Change-Id: Ib076702b6cd64aed315cd690fef5492c6207304c
Jakub Pawlowski [Tue, 21 Feb 2017 18:14:05 +0000 (18:14 +0000)]
Remove unnecessary extern declarations am:
96ad0d2596
am:
1eb53e9a06
Change-Id: Ieb18b2a9669cf3e240cfa7b3ac81143cd987213a
Jakub Pawlowski [Tue, 21 Feb 2017 18:07:00 +0000 (18:07 +0000)]
Merge changes from topic 'ble_scanner_callbacks'
am:
a77f83eddd
Change-Id: Ic65c3398a5e74488983f2025246d890763a813c0
Jakub Pawlowski [Tue, 21 Feb 2017 18:06:57 +0000 (18:06 +0000)]
Remove unnecessary extern declarations
am:
96ad0d2596
Change-Id: I1a7224223a1a0b7c5a0de2764f34058bd6feb586
Jakub Pawlowski [Tue, 21 Feb 2017 18:03:40 +0000 (18:03 +0000)]
Merge changes from topic 'ble_scanner_callbacks'
* changes:
Use base::Callbacks in BleScannerInterface (2/3)
Remove unnecessary extern declarations
Myles Watson [Tue, 21 Feb 2017 17:57:05 +0000 (17:57 +0000)]
Merge "Clean up some more #defines" am:
f4fb7e1443 am:
b1d02b5c5e
am:
4a572702aa
Change-Id: If52760ce494967ecb42253ef74d718c437f9a224
Myles Watson [Tue, 21 Feb 2017 17:53:02 +0000 (17:53 +0000)]
Merge "Clean up some more #defines" am:
f4fb7e1443
am:
b1d02b5c5e
Change-Id: I3e0701be739a7c5f6d5f6254de96d6b7155d79b2
Myles Watson [Tue, 21 Feb 2017 17:47:43 +0000 (17:47 +0000)]
Merge "Clean up some more #defines"
am:
f4fb7e1443
Change-Id: I523553f266bea5d78b3ff799ca1d68e7efa59bfc
Treehugger Robot [Tue, 21 Feb 2017 16:09:14 +0000 (16:09 +0000)]
Merge "Clean up some more #defines"
Pulkit Bhuwalka [Sat, 18 Feb 2017 04:04:23 +0000 (04:04 +0000)]
Fix SIGBUS error in BT stack when pairing with ARM boards am:
5a6b32562a am:
e428512e6d
am:
a1d2b539ef
Change-Id: Id88597d6464c369b3fb8265f364d9166cd7fab03
Pulkit Bhuwalka [Sat, 18 Feb 2017 03:38:29 +0000 (03:38 +0000)]
Fix SIGBUS error in BT stack when pairing with ARM boards am:
5a6b32562a
am:
e428512e6d
Change-Id: I882416f685753e7da7188a29f892d39c3a4e9b15
Pulkit Bhuwalka [Sat, 18 Feb 2017 03:36:35 +0000 (03:36 +0000)]
Fix SIGBUS error in BT stack when pairing with ARM boards
am:
5a6b32562a
Change-Id: I0fb8fdf6a8983c92115297ee3fb5f2f7ec27e701
Jakub Pawlowski [Thu, 16 Feb 2017 19:56:56 +0000 (11:56 -0800)]
Use base::Callbacks in BleScannerInterface (2/3)
The remaining four native callbacks need more internal refactoring
before they can be turned into a callbacks.
Bug:
30622771
Test: sl4a FilteringTest
Change-Id: I8e1532bdfa2b0f22545f095eb427fd5ac1a75b56
Jakub Pawlowski [Fri, 17 Feb 2017 22:20:40 +0000 (14:20 -0800)]
Remove unnecessary extern declarations
Test: manual
Change-Id: I21bdb5952fff359a9ee7091d740ecac13aad640a
Pulkit Bhuwalka [Sat, 18 Feb 2017 00:25:22 +0000 (16:25 -0800)]
Fix SIGBUS error in BT stack when pairing with ARM boards
This CL fixes the actual crash location on pairing within the code.
https://android-review.googlesource.com/#/c/338167/ fixed the macro.
Bug:
35154933
Test: Verified by building and pairing with RPI3/NXP Arm boards.
Change-Id: Ic35f446e53aa724ecab72801b7f89c70fd11ba62
Myles Watson [Fri, 17 Feb 2017 18:49:59 +0000 (10:49 -0800)]
test_vendor: Return success for no-ops
Bug:
35408667
Test: Marlin with debug library BT starts and stops
Change-Id: Idd95115c17ca2fed983526ea47a44799e7de6e0c
Jakub Pawlowski [Fri, 17 Feb 2017 23:08:30 +0000 (23:08 +0000)]
Thread switching simplification am:
0482c8a3f4 am:
1b6d9a6fc4
am:
0eb88b30ea
Change-Id: Ie90f7b28fb43247968951d2a199d9f7f37355237
Jakub Pawlowski [Fri, 17 Feb 2017 23:04:09 +0000 (23:04 +0000)]
Thread switching simplification am:
0482c8a3f4
am:
1b6d9a6fc4
Change-Id: I5f31817fe7720702e4de80e10943f53d5412ac0c
Jakub Pawlowski [Fri, 17 Feb 2017 23:02:53 +0000 (23:02 +0000)]
Thread switching simplification
am:
0482c8a3f4
Change-Id: Id72cd958f51558c98b28fb466e7a0b87e549756a
Jakub Pawlowski [Fri, 17 Feb 2017 20:18:59 +0000 (12:18 -0800)]
Thread switching simplification
* add jni_thread_wrapper
* add FROM_HERE parameter to do_in_jni_thread, this will be used in
later patches to make thread switching logs nice.
Bug:
30622771
Test: manual
Change-Id: I4c8f9e0f32c501a6126fe04f2476ab6453fe637e
Myles Watson [Fri, 17 Feb 2017 19:30:57 +0000 (19:30 +0000)]
Check the return value of the HAL init function am:
3e50ee8817 am:
98a62eb84f
am:
fc5f4c0969
Change-Id: I5a2fe32f792190f0d46e35ba626a47e37ba3d2d4
Myles Watson [Fri, 17 Feb 2017 19:23:41 +0000 (19:23 +0000)]
Check the return value of the HAL init function am:
3e50ee8817
am:
98a62eb84f
Change-Id: I3c21277c55156dce98003f7edb17e3264962703e
Myles Watson [Fri, 17 Feb 2017 19:18:40 +0000 (19:18 +0000)]
Check the return value of the HAL init function
am:
3e50ee8817
Change-Id: I1b5b7db6d3b626cf7fe70f8aa98f76060cda1fff
Myles Watson [Fri, 17 Feb 2017 16:30:18 +0000 (08:30 -0800)]
Check the return value of the HAL init function
If the HAL can be opened, but initialization fails, Bluetooth
can not start.
Test: Force an initialization failure, BT dies
Change-Id: I7dd5ed49c9e7873a666dc001e68bdc13660648ba
Myles Watson [Thu, 9 Feb 2017 17:38:07 +0000 (09:38 -0800)]
Clean up some more #defines
true -> TRUE
false -> FALSE
Test: builds
Change-Id: I2573b6ab81aa384cc6d20bb8beb84303aba06a66
Andre Eisenbach [Fri, 17 Feb 2017 03:22:06 +0000 (03:22 +0000)]
Fix HDP select thread id type am:
f28952970e am:
6c1929f588 am:
6bacd28c3e
am:
71d84ca4a3
Change-Id: Ia6a9312ac29deb524b9472c51046e01e8eacf558
Andre Eisenbach [Fri, 17 Feb 2017 03:04:34 +0000 (03:04 +0000)]
Fix HDP select thread id type am:
f28952970e am:
6c1929f588
am:
6bacd28c3e
Change-Id: Ibce71a56f288ec44c802d22f5e2063758065dc41
Andre Eisenbach [Fri, 17 Feb 2017 03:00:05 +0000 (03:00 +0000)]
Fix HDP select thread id type am:
f28952970e
am:
6c1929f588
Change-Id: Id4473f3db0f99789ad700101545aae349ae13a8a
Andre Eisenbach [Fri, 17 Feb 2017 02:55:04 +0000 (02:55 +0000)]
Fix HDP select thread id type
am:
f28952970e
Change-Id: I3171422ec9bfd8a0937ef500c9fc85b0af70b4e1
Andre Eisenbach [Fri, 17 Feb 2017 02:38:25 +0000 (18:38 -0800)]
Fix HDP select thread id type
Recent changes in libbionic cause pthread_join to SIGABRT if called with
an invalid thread id. The select_thread_id variable in the HDP
sub-system was truncated from long->int causing pthread_join to not find
the correct thread and triggering the error.
Using the correct type for select_thread_id fixes this problem.
Change-Id: Id332fa86cf7f30abd211588d32899d41e157b462
Fixes:
35432169
Test: manual; boot device, turn BT off; ensure it stays off
Pavlin Radoslavov [Thu, 16 Feb 2017 22:34:15 +0000 (22:34 +0000)]
Merge "Add a mutex to guard all btsnoop operations" am:
d8a0667363 am:
0c5b10be09 am:
267b056e34
am:
5882ecc741
Change-Id: I55f329fe87d0c254c8e991b2d05bb0c1c887a341
Pavlin Radoslavov [Thu, 16 Feb 2017 22:30:17 +0000 (22:30 +0000)]
Merge "Add a mutex to guard all btsnoop operations" am:
d8a0667363 am:
0c5b10be09
am:
267b056e34
Change-Id: I8ffcb7166ba8df99b2109ff4499737a3bc314dbf
Pavlin Radoslavov [Thu, 16 Feb 2017 22:26:18 +0000 (22:26 +0000)]
Merge "Add a mutex to guard all btsnoop operations" am:
d8a0667363
am:
0c5b10be09
Change-Id: Ie42a94583e0d65170b0b1a7477b1d05927ffb1aa
Pavlin Radoslavov [Thu, 16 Feb 2017 22:21:46 +0000 (22:21 +0000)]
Merge "Add a mutex to guard all btsnoop operations"
am:
d8a0667363
Change-Id: I1ba7c525e9cd24fd5d5d588b0b950e1cc39a785f
Treehugger Robot [Thu, 16 Feb 2017 22:14:23 +0000 (22:14 +0000)]
Merge "Add a mutex to guard all btsnoop operations"
Jakub Pawlowski [Thu, 16 Feb 2017 20:27:58 +0000 (20:27 +0000)]
Merge changes Idcbbc7eb,I3dc48800 am:
6f04f03f44 am:
9f0ff40820 am:
dc6dc99c58
am:
95d85ab5a9
Change-Id: I5edca0c358bfc0481ed27bf3a55400ee44b8e315
Jakub Pawlowski [Thu, 16 Feb 2017 20:27:46 +0000 (20:27 +0000)]
Fix advertise data parsing am:
2e97666062 am:
aacdc55171 am:
43a4986e41
am:
e056c609e9
Change-Id: I60a085c5ed379a146616f77b96e914b83e2fd617
Jakub Pawlowski [Thu, 16 Feb 2017 20:23:18 +0000 (20:23 +0000)]
Merge changes Idcbbc7eb,I3dc48800 am:
6f04f03f44 am:
9f0ff40820
am:
dc6dc99c58
Change-Id: I9e272358825f4fe24b5c4480a5588f12a20ba992
Jakub Pawlowski [Thu, 16 Feb 2017 20:23:06 +0000 (20:23 +0000)]
Fix advertise data parsing am:
2e97666062 am:
aacdc55171
am:
43a4986e41
Change-Id: Ib24e031ef6f4573286e8ccb16153ae5f002b8d16