OSDN Git Service
Jakub Pawlowski [Thu, 30 May 2019 18:12:43 +0000 (11:12 -0700)]
Merge "PDL: Add Arrays" am:
7d7dd39e90
am:
14e1e56692
Change-Id: Id8a55227d06aee5f5c30106a8743429073e2a951
Jakub Pawlowski [Thu, 30 May 2019 17:57:36 +0000 (10:57 -0700)]
Merge "PDL: Add Arrays"
am:
7d7dd39e90
Change-Id: I56e5fdfba619fb7ea9cede16320c1be360b80133
Jakub Pawlowski [Thu, 30 May 2019 17:45:17 +0000 (17:45 +0000)]
Merge "PDL: Add Arrays"
weichinweng [Thu, 30 May 2019 07:00:50 +0000 (00:00 -0700)]
[automerger skipped] Merge "Open connection if it doesn't exsist in bta_gattc_process_indicate" into qt-dev
am:
8c3e9415af -s ours
am skip reason: change_id I1b3415ef6aafb52a6ac229409514a85f35de5842 with SHA1
ffc9591983 is in history
Change-Id: I6ddf6a7ba7d23868ded2349c1265ab1b8b9acb15
TreeHugger Robot [Thu, 30 May 2019 06:22:12 +0000 (06:22 +0000)]
Merge "Open connection if it doesn't exsist in bta_gattc_process_indicate" into qt-dev
Cheney Ni [Thu, 30 May 2019 03:21:46 +0000 (20:21 -0700)]
Merge "Make sure the Hearing Aid source is ready before resuming or suspending calls" am:
f58ec178f5
am:
96be569a8c
Change-Id: I8c81fb44c22901a2e61d65e374119e44864b075e
Cheney Ni [Thu, 30 May 2019 03:16:45 +0000 (20:16 -0700)]
Merge "Make sure the Hearing Aid source is ready before resuming or suspending calls"
am:
f58ec178f5
Change-Id: Ied52e1d024172e4cb369b0af3641f04e294c195c
Treehugger Robot [Thu, 30 May 2019 02:58:08 +0000 (02:58 +0000)]
Merge "Make sure the Hearing Aid source is ready before resuming or suspending calls"
Myles Watson [Wed, 6 Feb 2019 22:02:36 +0000 (14:02 -0800)]
PDL: Add Arrays
Test: bluetooth_packet_parser_test
Change-Id: If7f057a16ab40066a53d2c66980c5579a480650f
Jakub Pawlowski [Wed, 29 May 2019 18:08:55 +0000 (11:08 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61 am:
a65c805c8c am:
46d990360b -s ours am:
8c6b9cc5cb -s ours
am:
b8b04c3cb5
Change-Id: Iced7f525d07c65df37d6d4e61f85051707eb8108
Jakub Pawlowski [Wed, 29 May 2019 18:03:44 +0000 (11:03 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61 am:
a65c805c8c am:
46d990360b -s ours
am:
8c6b9cc5cb -s ours
am skip reason: subject contains skip directive
Change-Id: I3c886016dbfb5c3f5bc54b491772b494d567b058
Jakub Pawlowski [Wed, 29 May 2019 17:57:39 +0000 (10:57 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61 am:
a65c805c8c
am:
46d990360b -s ours
am skip reason: subject contains skip directive
Change-Id: I12088a8d0fcd6faa30f5b0e4ca5dbc8d4dd88c05
Jakub Pawlowski [Wed, 29 May 2019 17:52:39 +0000 (10:52 -0700)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61
am:
a65c805c8c
Change-Id: I550868a91866949b0ee0e4d2f5d5031f079a824a
Jakub Pawlowski [Wed, 29 May 2019 17:48:40 +0000 (10:48 -0700)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913
am:
e1fb3fdd61
Change-Id: I802c3d22a7934f0d84dcbead758bfcad9195e401
weichinweng [Wed, 29 May 2019 10:51:38 +0000 (03:51 -0700)]
Open connection if it doesn't exsist in bta_gattc_process_indicate am:
ffc9591983
am:
85f0031fbc
Change-Id: I09dfc3f917f208a60e2cff206ed5d73423b36152
weichinweng [Wed, 29 May 2019 10:46:42 +0000 (03:46 -0700)]
Open connection if it doesn't exsist in bta_gattc_process_indicate
am:
ffc9591983
Change-Id: I1aab49dcdb7c2212271b6c0b8006b0edfdbb6712
weichinweng [Wed, 29 May 2019 06:27:15 +0000 (14:27 +0800)]
Open connection if it doesn't exsist in bta_gattc_process_indicate
If Service Changed indication is received before the connection is open
, send the BTA_GATTC_INT_CONN_EVT to open it before processing the
indication.
Bug:
131814072
Test: CTS Bluetooth LE Secure Test. Unit test.
Change-Id: I1b3415ef6aafb52a6ac229409514a85f35de5842
Merged-In: I1b3415ef6aafb52a6ac229409514a85f35de5842
weichinweng [Wed, 29 May 2019 06:27:15 +0000 (14:27 +0800)]
Open connection if it doesn't exsist in bta_gattc_process_indicate
If Service Changed indication is received before the connection is open
, send the BTA_GATTC_INT_CONN_EVT to open it before processing the
indication.
Bug:
131814072
Test: CTS Bluetooth LE Secure Test. Unit test.
Change-Id: I1b3415ef6aafb52a6ac229409514a85f35de5842
Myles Watson [Tue, 28 May 2019 20:52:48 +0000 (13:52 -0700)]
Merge "OS: Hold the mutex when decreasing the semaphore" am:
056e104366
am:
43f99fea21
Change-Id: Ib63eb93b592d9989e038ae5db2a87a385a83c555
Myles Watson [Tue, 28 May 2019 20:52:28 +0000 (13:52 -0700)]
Merge "OS: Protect invalidation_list_ with the mutex" am:
0f9422e984
am:
c47f73c4b8
Change-Id: Id8e78dc96ad28e9135147fa9b895fc5bae704e7b
Myles Watson [Tue, 28 May 2019 20:46:45 +0000 (13:46 -0700)]
Merge "OS: Hold the mutex when decreasing the semaphore"
am:
056e104366
Change-Id: I008b66416a6f1236a005ff1148e7cc57a14e2868
Myles Watson [Tue, 28 May 2019 20:46:26 +0000 (13:46 -0700)]
Merge "OS: Protect invalidation_list_ with the mutex"
am:
0f9422e984
Change-Id: Ib22eaeb3df605985fb3739c476ccdfc717bd8137
Treehugger Robot [Tue, 28 May 2019 20:31:20 +0000 (20:31 +0000)]
Merge "OS: Hold the mutex when decreasing the semaphore"
Treehugger Robot [Tue, 28 May 2019 20:29:21 +0000 (20:29 +0000)]
Merge "OS: Protect invalidation_list_ with the mutex"
Android Build Merger (Role) [Tue, 28 May 2019 19:22:47 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913
Change-Id: I48d0148eb1a45e93105b3baf6a42ba91221fc402
Android Build Merger (Role) [Tue, 28 May 2019 19:22:45 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512
Change-Id: I1f9eb6a5010e8ffef7b7e0912b7f6ce81067ccec
Android Build Merger (Role) [Tue, 28 May 2019 19:22:44 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf
Change-Id: I040da3eb560786454a69d3230cf7d559a98c9818
Android Build Merger (Role) [Tue, 28 May 2019 19:22:42 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462
Change-Id: I5af312e49f6c6440ae31d8bb55d1ed3311a46e43
Android Build Merger (Role) [Tue, 28 May 2019 19:22:40 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9
Change-Id: Id63bf05a79287ec45942647075c715e858f915d1
Jakub Pawlowski [Fri, 24 May 2019 20:01:09 +0000 (22:01 +0200)]
DO NOT MERGE Send HCI Read Encryption Key properly
This patch fixes bad HCI command being send instead of Read Encryption
Key Size.
Bug:
124301137
Test: pair and connect with Bluetooth headset
Change-Id: If325ef2771ca1546ae58df7c684f66ae537b8573
Cheney Ni [Fri, 24 May 2019 06:59:43 +0000 (14:59 +0800)]
Make sure the Hearing Aid source is ready before resuming or suspending calls
Those calls to resume / suspend streaming are from the audio's IPC
threads like HwBinder or UIPC, and calls to start / end session are from
the stack main thread. There is timing that those threads may run in
parallel, and trys to change the streaming state when the Hearing Aid
source is not ready. This change checks the source state before resuming
or suspending streaming, and breaks the deadlock between IPC threads and
the stack main thread.
Bug:
132860565
Test: 1. Connected to a Hearing Aids and disable the Bluetooth
2. Switch the active device manually
Change-Id: I6ae11faab3d530c65f55ffa9b8a9f3cae2bde5f4
Colin Cross [Tue, 28 May 2019 18:03:23 +0000 (11:03 -0700)]
Merge changes I42c47d98,If38ad50d am:
558c5114b6
am:
9771880d8e
Change-Id: Ie780be4bbd91131163721f33febf01fe08a8904d
Colin Cross [Tue, 28 May 2019 17:58:24 +0000 (10:58 -0700)]
Merge changes I42c47d98,If38ad50d
am:
558c5114b6
Change-Id: I0cd8aba87330c1b8dd77eeefb83542e15d5b76e3
Treehugger Robot [Tue, 28 May 2019 17:52:14 +0000 (17:52 +0000)]
Merge changes I42c47d98,If38ad50d
* changes:
Fix mac build
bpfmt -w $(find . -name Android.bp)
Jakub Pawlowski [Tue, 28 May 2019 17:23:13 +0000 (10:23 -0700)]
Merge "Add missing header in gd/packet/parser/checksum_type_checker.h" am:
7b4e117cd7
am:
760d0e227d
Change-Id: I13702b3a7e088a90bb20730e94eee5e37ca36946
Jakub Pawlowski [Tue, 28 May 2019 17:20:12 +0000 (10:20 -0700)]
Merge "Add missing header in gd/packet/parser/checksum_type_checker.h"
am:
7b4e117cd7
Change-Id: Iaa4dd3b3a6da0812a0e0486dc2286c85794ba4ef
Myles Watson [Tue, 28 May 2019 16:43:55 +0000 (09:43 -0700)]
OS: Hold the mutex when decreasing the semaphore
Test: bluetooth_test_gd # Run in a loop
Change-Id: I72e9f28c417986f63390cbbbe6467f64df6e9237
Treehugger Robot [Tue, 28 May 2019 17:02:33 +0000 (17:02 +0000)]
Merge "Add missing header in gd/packet/parser/checksum_type_checker.h"
Myles Watson [Fri, 24 May 2019 21:23:41 +0000 (14:23 -0700)]
OS: Protect invalidation_list_ with the mutex
Test: AclManagerTest.startup_teardown
Change-Id: I5a9467691ffd1bb6bc2bb9d1080dce5f5bc655fa
Jakub Pawlowski [Tue, 28 May 2019 16:24:04 +0000 (09:24 -0700)]
GD ECC: add const qualifiers am:
c49f35a9e7
am:
df6f04428c
Change-Id: Iadf9befd87cd7ac9a67065019c02ae59e179e35c
Jakub Pawlowski [Tue, 28 May 2019 16:18:58 +0000 (09:18 -0700)]
GD ECC: add const qualifiers
am:
c49f35a9e7
Change-Id: I957679ee7cc5e3eb3f8407d6bd608066bac1695d
Jakub Pawlowski [Tue, 28 May 2019 15:55:47 +0000 (17:55 +0200)]
Add missing header in gd/packet/parser/checksum_type_checker.h
Test: compilation
Change-Id: I7a72cba471db5e59c8a6fa2ee1ba03cc258719ef
Jakub Pawlowski [Mon, 27 May 2019 18:25:49 +0000 (20:25 +0200)]
GD ECC: add const qualifiers
Test: SmpEccValidationTest
Bug:
126463795
Change-Id: I2e8b6027f959a181655286fb061bbb30b91e57f8
Ted Wang [Mon, 27 May 2019 02:06:27 +0000 (19:06 -0700)]
Merge "Disable absolute volume control for AirPods 2" am:
d05a79af66
am:
df13434930
Change-Id: I020bccbab26f475d7ebd3c2d71307fe0385d37db
Ted Wang [Mon, 27 May 2019 02:01:30 +0000 (19:01 -0700)]
Merge "Disable absolute volume control for AirPods 2" into qt-dev
am:
961d96bbf6
Change-Id: I7f181a4a639450feed556e68bc58f89740c15faa
Ted Wang [Mon, 27 May 2019 02:01:26 +0000 (19:01 -0700)]
Merge "Disable absolute volume control for AirPods 2"
am:
d05a79af66
Change-Id: If83644e1903e4e2b8046ff8f21d04131ce9780f6
Ted Wang [Mon, 27 May 2019 01:51:19 +0000 (01:51 +0000)]
Merge "Disable absolute volume control for AirPods 2" into qt-dev
Ted Wang [Thu, 23 May 2019 11:26:34 +0000 (19:26 +0800)]
Disable absolute volume control for AirPods 2
Volume of AirPods 2 start out extremely loud when absolute volume
enabled. Interim response from remote show normal when register volume
changed notification. Disable absolute volume control for AirPods 2 to
avoid volume start out extremely loud.
Bug:
129602489
Test: Play music with AirPods 2
Merged-In: I555576be1929a42ae8e01f661572a89d1993dee9
Change-Id: I555576be1929a42ae8e01f661572a89d1993dee9
Ted Wang [Mon, 27 May 2019 01:50:04 +0000 (01:50 +0000)]
Merge "Disable absolute volume control for AirPods 2"
Jakub Pawlowski [Sat, 25 May 2019 13:26:30 +0000 (06:26 -0700)]
GD SMP ECC improvements part 1 am:
93ecb665a5
am:
d032abd2b8
Change-Id: Id6b9d2fff3333f6baf4c004382f1162acfd038e2
Jakub Pawlowski [Sat, 25 May 2019 13:21:24 +0000 (06:21 -0700)]
GD SMP ECC improvements part 1
am:
93ecb665a5
Change-Id: If3afe3f844e8d6134fba4af4105cb5386244923d
Jakub Pawlowski [Sat, 25 May 2019 09:11:44 +0000 (02:11 -0700)]
Merge "Eliptic Curve Cryptography for GD" am:
e5656f79b2
am:
3a4b953995
Change-Id: I5e16bb7d44f022c05685964b567390f32a43acee
Jakub Pawlowski [Sat, 25 May 2019 09:06:40 +0000 (02:06 -0700)]
Merge "Eliptic Curve Cryptography for GD"
am:
e5656f79b2
Change-Id: I80ae2e38c782c96b37cc9603cd5eb7f4da71a239
Jakub Pawlowski [Thu, 23 May 2019 15:06:58 +0000 (17:06 +0200)]
GD SMP ECC improvements part 1
* make curve parameters into constants
* separate multipoint from BT specific ECC curve
Test: SmpEccValidationTest
Bug:
126463795
Change-Id: If6401c3038b340926310eafb40c2b7c5dc40dba9
Jakub Pawlowski [Sat, 25 May 2019 08:53:14 +0000 (08:53 +0000)]
Merge "Eliptic Curve Cryptography for GD"
Myles Watson [Fri, 24 May 2019 20:27:48 +0000 (13:27 -0700)]
Merge changes I610e6f4f,Ib7dc12d8 am:
a86d1b4490
am:
5838d9448c
Change-Id: I8537d41be02e9e9ff7ad2d00c295fb872b5b99cf
Myles Watson [Fri, 24 May 2019 20:22:48 +0000 (13:22 -0700)]
Merge changes I610e6f4f,Ib7dc12d8
am:
a86d1b4490
Change-Id: I92ad02a08fa616879133f76ee55c3d62af5008e7
Treehugger Robot [Fri, 24 May 2019 19:50:25 +0000 (19:50 +0000)]
Merge changes I610e6f4f,Ib7dc12d8
* changes:
OS: Construct Handler using Reactor
Queue: Store callbacks in the runnable
Yi Kong [Fri, 24 May 2019 18:18:08 +0000 (11:18 -0700)]
Merge "Turn off the new pass manager for coverage builds" am:
0745b6e550
am:
59979606c6
Change-Id: Id5b7472e3dd240ab687431072320a5cea965b353
Yi Kong [Fri, 24 May 2019 18:10:42 +0000 (11:10 -0700)]
Merge "Turn off the new pass manager for coverage builds"
am:
0745b6e550
Change-Id: Ib4a330c7cefacba8bb2f29b83988c73a5e23fba3
Yi Kong [Fri, 24 May 2019 17:33:26 +0000 (17:33 +0000)]
Merge "Turn off the new pass manager for coverage builds"
Jakub Pawlowski [Wed, 22 May 2019 20:37:44 +0000 (22:37 +0200)]
Eliptic Curve Cryptography for GD
This patch moves the code and adds the necessary namespace.
Further improvements in upcoming patches.
Test: SmpEccValidationTest
Bug:
126463795
Change-Id: I2682ff96aa904dd89ca6b5f2487fe72047211374
Myles Watson [Fri, 24 May 2019 17:09:05 +0000 (10:09 -0700)]
OS: Construct Handler using Reactor
Store a Reactor instead of a Thread in Handler. Allow construction from either.
Test: bluetooth_test_gd --gtest_filter=QueueTestSingleThread.no_unregister_enqueue_death_test
Change-Id: I610e6f4ffb48120d1fa47b4ff59b59375c7a11d8
Myles Watson [Thu, 23 May 2019 23:33:11 +0000 (16:33 -0700)]
Queue: Store callbacks in the runnable
Test: bluetooth_test_gd \
--gtest_filter=QueueTest.pass_smart_pointer_and_unregister
Change-Id: Ib7dc12d8e767125e51d83810ade77c5187a4c174
Colin Cross [Thu, 23 May 2019 21:10:48 +0000 (14:10 -0700)]
Fix mac build
system/bt/gd is compiled for the host but does not work on mac,
disable it.
Fixes:
133439713
Test: mmma system/bt/gd
Change-Id: I42c47d987ebfa8bba498a438d742388d216cedd2
Colin Cross [Thu, 23 May 2019 21:12:59 +0000 (14:12 -0700)]
bpfmt -w $(find . -name Android.bp)
Test: none
Change-Id: If38ad50d848c9e40f07c6598272a354312d9efea
Jakub Pawlowski [Thu, 23 May 2019 20:16:33 +0000 (13:16 -0700)]
Fix CryptoToolboxTest.bt_spec_test_d_1_test am:
0a2f6b52e2
am:
2aa3c39a7b
Change-Id: Ic8c79ffb852a2226ebaa800c1f1b7e19dce1aa2d
Jakub Pawlowski [Thu, 23 May 2019 18:14:17 +0000 (11:14 -0700)]
Fix CryptoToolboxTest.bt_spec_test_d_1_test
am:
0a2f6b52e2
Change-Id: Ia2e928cfb293434450426b77b7081681b304f8d8
Ted Wang [Thu, 23 May 2019 11:26:34 +0000 (19:26 +0800)]
Disable absolute volume control for AirPods 2
Volume of AirPods 2 start out extremely loud when absolute volume
enabled. Interim response from remote show normal when register volume
changed notification. Disable absolute volume control for AirPods 2 to
avoid volume start out extremely loud.
Bug:
129602489
Test: Play music with AirPods 2
Change-Id: I555576be1929a42ae8e01f661572a89d1993dee9
Jakub Pawlowski [Thu, 23 May 2019 10:43:47 +0000 (03:43 -0700)]
Get rid of KEY_LENGTH_DWORDS_P192 am:
24ad423f63
am:
e56a0b8ee9
Change-Id: I02fc07cae2ccd57e11e7911530d9485902f9e88a
Jakub Pawlowski [Thu, 23 May 2019 09:01:21 +0000 (02:01 -0700)]
Get rid of KEY_LENGTH_DWORDS_P192
am:
24ad423f63
Change-Id: I45718435e6721aa84a9523faf7790be6aa122b7f
Jakub Pawlowski [Thu, 23 May 2019 07:52:34 +0000 (09:52 +0200)]
Fix CryptoToolboxTest.bt_spec_test_d_1_test
When moving code, ElementsAreArray matcher was replaced by memcmp to
remove dependency, but "== 0" is missing to actually make sure elements
are same.
Bug:
132863815
Test: CryptoToolboxTest.bt_spec_test_d_1_test
Change-Id: I4069ee3baea9de095b23072820cef3bd0673608a
Yi Kong [Tue, 23 Apr 2019 07:55:27 +0000 (00:55 -0700)]
Turn off the new pass manager for coverage builds
The new pass manager crashes if `-fprofile-instr-generat` cflag is set
on the current stable Android compiler. Turn it off until we roll past
the revision with the fix.
Test: build
Bug:
131855431
Bug:
131132095
Change-Id: I92f36b73747cca898e104118a2721a4796511282
Jakub Pawlowski [Wed, 27 Feb 2019 09:00:17 +0000 (10:00 +0100)]
Get rid of KEY_LENGTH_DWORDS_P192
Only KEY_LENGTH_DWORDS_P256 is used.
Test: compilation
Bug:
126463795
Change-Id: I32a80e4b012c4606a70994fa9d0b5c2602707bb3
Myles Watson [Thu, 23 May 2019 04:40:43 +0000 (21:40 -0700)]
Merge "PDL: Strengthen CamelCase checks" am:
957842ff56
am:
20234b69a5
Change-Id: I0671872b21ba25daccb445a95f8cd991b25e00f3
Jakub Pawlowski [Thu, 23 May 2019 04:36:30 +0000 (21:36 -0700)]
crypto_toolbox am:
5c70347620
am:
2e52b0413b
Change-Id: Ib453828803a82501985e147d3edfc5c7365906fc
Myles Watson [Thu, 23 May 2019 02:00:02 +0000 (19:00 -0700)]
Merge "PDL: Strengthen CamelCase checks"
am:
957842ff56
Change-Id: Iedb4254872db5fded4731c20df6d075bd203f057
Jakub Pawlowski [Thu, 23 May 2019 01:56:14 +0000 (18:56 -0700)]
crypto_toolbox
am:
5c70347620
Change-Id: I80c9e53d5beffc5fea7a310c72454fdeaf2d1dbe
Treehugger Robot [Wed, 22 May 2019 22:26:17 +0000 (22:26 +0000)]
Merge "PDL: Strengthen CamelCase checks"
Myles Watson [Wed, 22 May 2019 17:52:49 +0000 (10:52 -0700)]
PDL: Strengthen CamelCase checks
Test: bluetooth_packet_parser_test
Change-Id: I1f85a0435aeab79cee8b938061c3961b6a21c49b
Jakub Pawlowski [Wed, 22 May 2019 15:36:24 +0000 (17:36 +0200)]
crypto_toolbox
This is copy of the crypto_toolbox for GD usage.
Only necessary changes were made:
* removed dependency on bt_types.h
* removed dependency on libbase
* reformatted code
* added namespace
Further improvements will be stacked on top of this patch.
Test: CryptoToolboxTest
Bug:
132863815
Change-Id: I639ba42705b23218a14085abcf431d744f87b913
Evgenii Stepanov [Wed, 22 May 2019 04:11:23 +0000 (21:11 -0700)]
Merge "Fix use-after-free in ReactorPerformanceTest::TearDown." am:
6af0cf0de9
am:
e32c07ae04
Change-Id: I95055d3a54b2769e7f2ac00473609e5ebbb2eb47
Evgenii Stepanov [Wed, 22 May 2019 03:10:15 +0000 (20:10 -0700)]
Merge "Fix use-after-free in ReactorPerformanceTest::TearDown."
am:
6af0cf0de9
Change-Id: If9d01dd2f3a6cef54ded5ad66bff85039943e511
Treehugger Robot [Wed, 22 May 2019 00:18:35 +0000 (00:18 +0000)]
Merge "Fix use-after-free in ReactorPerformanceTest::TearDown."
Evgenii Stepanov [Tue, 21 May 2019 21:12:39 +0000 (14:12 -0700)]
Fix use-after-free in ReactorPerformanceTest::TearDown.
Bug:
128921871
Test: net_test_performance
Change-Id: I7b7fda7c437f75019564a0b56764d40704b0b33f
Ugo Yu [Tue, 21 May 2019 20:46:09 +0000 (13:46 -0700)]
Merge "Pairng: Fix crosskey paring" into qt-dev
am:
079ebe2abe
Change-Id: I44e2c940fff402648aebd8044290fe6d5ace5bf8
TreeHugger Robot [Tue, 21 May 2019 18:40:52 +0000 (18:40 +0000)]
Merge "Pairng: Fix crosskey paring" into qt-dev
Chienyuan [Tue, 21 May 2019 17:16:40 +0000 (10:16 -0700)]
Merge "QueueTest: UnregisterDequeue before promise set value" am:
569cc603b0
am:
5f0ae3bf42
Change-Id: I9a8d586bfbc6681d8a08482c26df12a0ff4d3a00
Ugo Yu [Fri, 19 Apr 2019 09:40:38 +0000 (17:40 +0800)]
Pairng: Fix crosskey paring
* Send BONDING event to Java when static identity address is
first obtained during crosskey pairing
* Send BONDING event to Java for the initial random address
before send BONDED event
* Do not send bond event for static identity address when SDP is done.
* Make sure pairing control block always get cleaned up when both SDP
and pairing are done
* Send empty UUIDs to Java layer to unblock bonding intent broadcast
when SDP fails
Bug:
130553855
Fixes:
128518468
Test: pair between two dual mode phones, starting from SMP first to
trigger crosskey pairing
Change-Id: I56f3071595a6fb0cb5fe4df63eae33f8d4858141
Chienyuan [Tue, 21 May 2019 16:10:37 +0000 (09:10 -0700)]
Merge "QueueTest: UnregisterDequeue before promise set value"
am:
569cc603b0
Change-Id: I05e083c4f6ca40e93b015e8320742aa3a7181386
Treehugger Robot [Tue, 21 May 2019 15:45:42 +0000 (15:45 +0000)]
Merge "QueueTest: UnregisterDequeue before promise set value"
Weichin Weng [Mon, 20 May 2019 03:48:27 +0000 (20:48 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add dump debug buffer feature" am:
45c9bb02a9
am:
ae6f2844ff
Change-Id: I4cc483586fefa5c5454d6225048b3395d77128da
Weichin Weng [Mon, 20 May 2019 03:44:22 +0000 (20:44 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add dump debug buffer feature"
am:
45c9bb02a9
Change-Id: Ib2b58ae5ed347759bf59d2bea9e03060fd3ff1e1
Weichin Weng [Mon, 20 May 2019 03:38:04 +0000 (03:38 +0000)]
Merge "Hearing Aid Dump Audio Tool: Add dump debug buffer feature"
Myles Watson [Sat, 18 May 2019 01:37:34 +0000 (18:37 -0700)]
Merge "Remove Address dependency from PacketParserTest" am:
46512f1526
am:
b2e8494941
Change-Id: Ia58aa629312788c35898997b8e10c6b1a8891592
Myles Watson [Sat, 18 May 2019 01:08:36 +0000 (18:08 -0700)]
Merge "Remove Address dependency from PacketParserTest"
am:
46512f1526
Change-Id: Iff97fcf52ecc8de81ba3bf5a9a4735073af6bbd3
Treehugger Robot [Sat, 18 May 2019 00:19:33 +0000 (00:19 +0000)]
Merge "Remove Address dependency from PacketParserTest"
Cheney Ni [Fri, 17 May 2019 22:44:22 +0000 (15:44 -0700)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" am:
ef34871622
am:
10d252f20a
Change-Id: I816d773ba61409ec0fe2fbfbf0e434ca82f5cc55
Cheney Ni [Fri, 17 May 2019 21:52:59 +0000 (14:52 -0700)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream"
am:
ef34871622
Change-Id: I72f4d8301214c3fb3cd25f1be593a7bfdeebd917
Treehugger Robot [Fri, 17 May 2019 21:29:23 +0000 (21:29 +0000)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream"