OSDN Git Service
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"
Haibo Huang [Fri, 17 May 2019 20:18:10 +0000 (13:18 -0700)]
Import ::testing::DoAll am:
1c360dc577
am:
d6e325fe4a
Change-Id: Ic88539c48fd7ee18774936d78eb599a94fb82878
Haibo Huang [Fri, 17 May 2019 19:27:39 +0000 (12:27 -0700)]
Import ::testing::DoAll
am:
1c360dc577
Change-Id: I9ec0bcfc9c46d2ce45cf7ffd8ab46df62abf1836
Myles Watson [Fri, 17 May 2019 16:01:36 +0000 (09:01 -0700)]
Remove Address dependency from PacketParserTest
Test: bluetooth_packet_parser_test
Change-Id: I769e0ea2feacbc8c14598762f01746c76efe1079
weichinweng [Fri, 19 Apr 2019 09:27:32 +0000 (17:27 +0800)]
Hearing Aid Dump Audio Tool: Add dump debug buffer feature
Add dump HearingAid debug buffer feature to let the HearingAid debug
information dump to debug file and make it readable.
Bug:
130781854
Test: ./dump_hearingaid_audio.py -d true btsnoop_hci.log
./dump_hearingaid_audio.py -sd true btsnoop_hci.log
Change-Id: I150fd897e6f197d5b853554734926ad613de4e6b
Haibo Huang [Fri, 17 May 2019 04:59:01 +0000 (21:59 -0700)]
Import ::testing::DoAll
It is used in this file but didn't have corresponding using statement.
It fails compile in new googletest.
Test: build
Change-Id: I1ac9d04c1bc8c46b57ecfb7859ee0e3c31bbb092
Chienyuan [Fri, 17 May 2019 02:57:46 +0000 (10:57 +0800)]
QueueTest: UnregisterDequeue before promise set value
For some tests, ~Queue will() be trigger right after we get promise
we should UnregisterDequeue before promise set value to prevent
race condition
Test: atest bluetooth_test_gd
Change-Id: I9409b6829cce61ef95c766a1d3b3679197b8f9f4
Hansong Zhang [Fri, 17 May 2019 01:20:07 +0000 (18:20 -0700)]
Merge changes I2526f4bc,Iafe4a46d am:
55696dd72c
am:
e0172b14c1
Change-Id: I35ae94d269311f67960a7c15979c0f259551f69d
Hansong Zhang [Fri, 17 May 2019 00:10:01 +0000 (17:10 -0700)]
Merge changes I2526f4bc,Iafe4a46d
am:
55696dd72c
Change-Id: Iee52bb52cd210cc3f353a37c968102022b213438
Treehugger Robot [Thu, 16 May 2019 22:48:06 +0000 (22:48 +0000)]
Merge changes I2526f4bc,Iafe4a46d
* changes:
Allow Handler synchronization in test code
Remove testing code from ModuleRegistry
Jakub Pawlowski [Thu, 16 May 2019 21:50:30 +0000 (14:50 -0700)]
Merge "crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters" am:
fe02675de8
am:
1b0a882319
Change-Id: I5be83b4f021e0e2a0ec80f6abf4e25dbbdc13e10
Jakub Pawlowski [Thu, 16 May 2019 20:37:13 +0000 (13:37 -0700)]
Merge "crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters"
am:
fe02675de8
Change-Id: I9f7c445718ef3a2f54a019a6f4a87c8ba94cfb9d
Jakub Pawlowski [Thu, 16 May 2019 19:42:35 +0000 (19:42 +0000)]
Merge "crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters"
Martin Brabham [Thu, 16 May 2019 18:50:33 +0000 (11:50 -0700)]
Merge "Add SMP PDL definition." am:
4b8f333982
am:
a4cc8e5769
Change-Id: Ib02f65d5f40bafecc52bd9980d01e5b3ad7af60c
Jakub Pawlowski [Thu, 16 May 2019 18:49:25 +0000 (11:49 -0700)]
Make AES control block into a thread local variable am:
59942e1b9a
am:
57cfda268b
Change-Id: I95aad39117db976118d8149f687983da8c40fa7b
Martin Brabham [Thu, 16 May 2019 18:21:58 +0000 (11:21 -0700)]
Merge "Add SMP PDL definition."
am:
4b8f333982
Change-Id: I0e6a985c210717d9a93a269aa67ac359f273df2c
Jakub Pawlowski [Thu, 16 May 2019 18:20:55 +0000 (11:20 -0700)]
Make AES control block into a thread local variable
am:
59942e1b9a
Change-Id: Ib09ebcdac90e0203fa15bd1044ff85cea25efa18
Treehugger Robot [Thu, 16 May 2019 17:48:15 +0000 (17:48 +0000)]
Merge "Add SMP PDL definition."
Martin Brabham [Thu, 16 May 2019 16:36:10 +0000 (09:36 -0700)]
Add SMP PDL definition.
Bug:
132863815
Test: N/A
Change-Id: I5d762432be133a264db1f9b9de74acad2c60b429
Jakub Pawlowski [Thu, 16 May 2019 10:55:08 +0000 (12:55 +0200)]
crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters
Bug:
132863815
Change-Id: I58de98b9087c81a27054eb8302212a1bf0595093
Jakub Pawlowski [Thu, 16 May 2019 10:34:06 +0000 (12:34 +0200)]
Make AES control block into a thread local variable
When computing ACES-CMAC, we use static control block that's shared
between multiple threads. That means that having computation done in
different threads can interfere and cause bad value to be returned.
This patch fixes that by making the control block into thread local
variable.
Bug:
132863815
Change-Id: Ibe2aaac54b93f77d644564d23694846c0c078bd6
Martin Brabham [Thu, 16 May 2019 03:47:36 +0000 (20:47 -0700)]
NIAP: Add a new argument to determine single user mode status.
am:
1a88ace397
Change-Id: Ie2866d3a9a83a766fed52e2974fbfd08306536ef
Martin Brabham [Thu, 16 May 2019 03:47:23 +0000 (20:47 -0700)]
Revert "btif: Short circuit NIAP key attestation check"
am:
1a275856ab
Change-Id: I4ff7b873c77f38c6f2127bb34582fe6bde2f433e
Xin Li [Thu, 16 May 2019 02:08:00 +0000 (19:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master" into stage-aosp-master
am:
cd463e2f54 -s ours
am skip reason: subject contains skip directive
Change-Id: I440c8f34f479aa2551c9284feb6992c49c6e83e7
Xin Li [Thu, 16 May 2019 00:44:12 +0000 (17:44 -0700)]
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master
am:
10b627bb35 -s ours
am skip reason: subject contains skip directive
Change-Id: Id9a1659cea359458dab5ecd1b03ab6bbd5a5009b
Martin Brabham [Fri, 10 May 2019 19:42:15 +0000 (12:42 -0700)]
NIAP: Add a new argument to determine single user mode status.
This is being used to section off the feature to single user mode
devices as provisioned devices requiring compliance will be
single user mode only. This is a stop-gap waiting on a vendor code fix.
RE keystore (qseecom) problems: b/
129759834
Bug: b/
117993149
Test: atest net_test_bluetooth
Change-Id: I4fb3f4e663a051db8f8ba12901a20fa18ebf197e
TreeHugger Robot [Wed, 15 May 2019 23:02:12 +0000 (23:02 +0000)]
Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master" into stage-aosp-master
Myles Watson [Wed, 15 May 2019 20:32:15 +0000 (13:32 -0700)]
Merge "L2CAP: Always use SUCCESS" am:
f256ea9c02
am:
d4ff4d3644
Change-Id: I4567e2a3cc352ca30bab270599cb574072d02ecd
Myles Watson [Wed, 15 May 2019 20:24:00 +0000 (13:24 -0700)]
Merge "L2CAP: Always use SUCCESS"
am:
f256ea9c02
Change-Id: If78bace42679e10a74b8b3df98feda1970e29450
Treehugger Robot [Wed, 15 May 2019 20:00:38 +0000 (20:00 +0000)]
Merge "L2CAP: Always use SUCCESS"
Martin Brabham [Mon, 22 Apr 2019 18:26:02 +0000 (11:26 -0700)]
Revert "btif: Short circuit NIAP key attestation check"
This reverts commit
24200b230ab9c5dec4f3f10a4b36cf7f84515e05.
Bug:
117993149
Myles Watson [Wed, 15 May 2019 18:31:23 +0000 (11:31 -0700)]
Require a semicolon after ASSERT am:
49496a3d06
am:
546d2fc915
Change-Id: I30d37346f96649d6a14628af725ddbb73bfd9e8e
Myles Watson [Wed, 15 May 2019 18:26:17 +0000 (11:26 -0700)]
Require a semicolon after ASSERT
am:
49496a3d06
Change-Id: I15734a820b5a67733babd0aae0263f8f97edc508
Myles Watson [Tue, 14 May 2019 21:11:55 +0000 (14:11 -0700)]
Require a semicolon after ASSERT
Test: atest --host bluetooth_test_gd
Change-Id: I304d097f6094eecdad04d99c9397475b4721115c
Myles Watson [Wed, 15 May 2019 14:18:18 +0000 (07:18 -0700)]
L2CAP: Always use SUCCESS
Test: bluetooth_test_gd --gtest_filter=*L2*
Change-Id: I6070168e2d9055b6d7f54726a773ab646dcb567c
Hansong Zhang [Thu, 9 May 2019 23:40:37 +0000 (16:40 -0700)]
Allow Handler synchronization in test code
SynchronizeModuleHandler() blocks until all previous closures are done.
Test: atest bluetooth_test_gd --host
Change-Id: I2526f4bc1c5ce485ceaedbd0cb744a98b928518b
Myles Watson [Wed, 15 May 2019 14:31:57 +0000 (07:31 -0700)]
Remove testing code from ModuleRegistry
Test: atest --host bluetooth_test_gd
Change-Id: Iafe4a46d4dfc134f4dd9ee1fcbed527a7ec34ed0
Cheney Ni [Wed, 15 May 2019 06:09:49 +0000 (14:09 +0800)]
While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream
There were 2 cases to start the 2nd stream automatically by the stack:
* When the 2nd AVDT opened, the stack would check the 1st stream state
to determinate the 2nd should be starting or not.
* While the AVRC timer which was fired after AVDT opened was expired,
the stack would open the AVRC and start the 2nd stream if the 1st was
started.
Both of them are unnecessary since all the stream must be controlled by
the upper layer. We currently support an active device only, and the
2nd stream will be tracked as remote triggered and suspended immediately.
To samplize the behavior, it is better to not start the 2nd stream
automatically by the stack.
Bug:
132146974
Test: manual
Change-Id: I75f39801e9779ee55fa574e30051e01966c61ea3
Myles Watson [Tue, 14 May 2019 23:00:16 +0000 (16:00 -0700)]
Merge "HCI: Add classic interface definitions" am:
b8b18593c6
am:
5408e7b9b1
Change-Id: Ic5738cd2f7a7b99dac25e85384f8cf2943f1dd2a
Myles Watson [Tue, 14 May 2019 22:55:11 +0000 (15:55 -0700)]
Merge "HCI: Add classic interface definitions"
am:
b8b18593c6
Change-Id: If2710b9c0327ac8456984722524d464512abfe81
Treehugger Robot [Tue, 14 May 2019 22:27:20 +0000 (22:27 +0000)]
Merge "HCI: Add classic interface definitions"
Myles Watson [Sat, 23 Feb 2019 00:08:06 +0000 (16:08 -0800)]
HCI: Add classic interface definitions
Test: bluetooth_test_gd --gtest_filter=*Hci*
Change-Id: I4206c818084302341d4e99f2cce8aad1c12ce4ae
Xin Li [Tue, 14 May 2019 19:08:50 +0000 (12:08 -0700)]
DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master
Bug:
132622481
Change-Id: Iec8c8a55b0f442d3ce16c86872e59c68f61cf36b
Myles Watson [Fri, 10 May 2019 20:21:21 +0000 (13:21 -0700)]
[automerger skipped] Merge changes from topic "am-
850e8d8f178c4deab0c5779bfd339edb" into qt-dev
am:
81b014e9ef -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: I6306edf628b4806b34dea49282a4014d75604ed0
Peter Collingbourne [Fri, 10 May 2019 20:18:03 +0000 (13:18 -0700)]
Revert "Preserve x18 while calling aptX encoder libraries."
am:
7d05765de0
Change-Id: I24bb7473eca3cd80f0c055abb4991edaab3beb0c
Android Build Merger (Role) [Fri, 10 May 2019 19:23:20 +0000 (19:23 +0000)]
Merge changes from topic "am-
850e8d8f178c4deab0c5779bfd339edb" into qt-dev
* changes:
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0 am:
6479bff4cf -s ours am:
743f7856b2 -s ours am:
2685a77b62 -s ours am skip reason: subject contains skip directive
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3 am:
7316c97cd1 -s ours am:
6d827a4be2 -s ours am:
459c49e908 -s ours am skip reason: subject contains skip directive
Myles Watson [Fri, 10 May 2019 19:22:26 +0000 (12:22 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0 am:
6479bff4cf -s ours am:
743f7856b2 -s ours
am:
2685a77b62 -s ours
am skip reason: subject contains skip directive
Change-Id: I5e96cb704542fca1b942f764b5372741bc858c7b
Myles Watson [Fri, 10 May 2019 19:21:52 +0000 (12:21 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3 am:
7316c97cd1 -s ours am:
6d827a4be2 -s ours
am:
459c49e908 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib8e3671ae80e0c870b8867e2bbfac831c97367b5
Myles Watson [Fri, 10 May 2019 19:07:40 +0000 (12:07 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0 am:
6479bff4cf -s ours
am:
743f7856b2 -s ours
am skip reason: subject contains skip directive
Change-Id: Iff03c5de4fab55d3bc54812f776040464011ac9e
Myles Watson [Fri, 10 May 2019 19:07:00 +0000 (12:07 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3 am:
7316c97cd1 -s ours
am:
6d827a4be2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ice25049f5b4e398e21345d3f6f69088cd68389cb
Myles Watson [Fri, 10 May 2019 19:03:13 +0000 (12:03 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0
am:
6479bff4cf -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: I0e3438cb5090abcb65e4863ff725db2fe8b35f30
Myles Watson [Fri, 10 May 2019 19:01:54 +0000 (12:01 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3
am:
7316c97cd1 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: If63f87a0300606a903bc8f7e9af6fb8e0ad708fd
Myles Watson [Fri, 10 May 2019 18:56:51 +0000 (11:56 -0700)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev
am:
3bf41c03e0
Change-Id: Iea733c12789b381728a66f9de7c60c9420072cf1
Myles Watson [Fri, 10 May 2019 18:56:27 +0000 (11:56 -0700)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
cd7bdf4cc3
Change-Id: I3f1d66a7c9da0740c0086d061a9cfc7c8ce0909a
Peter Collingbourne [Fri, 10 May 2019 17:45:48 +0000 (10:45 -0700)]
Revert "Preserve x18 while calling aptX encoder libraries."
This reverts commit
8a25a1756b5600ea65134fe8f7729228ad8c535f which was a
workaround for an issue with prebuilts that has now been fixed.
Bug:
112907825
Bug:
120621517
Change-Id: Ia61b1b3a238716f7e7860a356eac086a79a07742
Stanley Tng [Fri, 10 May 2019 06:05:50 +0000 (23:05 -0700)]
[automerger skipped] Merge "Add Delay reporting for Hearing Aids" into qt-dev
am:
c0d922f138 -s ours
am skip reason: change_id If4bef049c18a3912817c2fa96b9bd890d5712c22 with SHA1
94f3a3ac7a is in history
Change-Id: Ia79d0371e1962832d830032870ddd5aa049ab7cc
Myles Watson [Fri, 10 May 2019 01:10:00 +0000 (18:10 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3 am:
7642947735 am:
d7a673d47f am:
5b80ee9db6
am:
019ee2043d
Change-Id: Iad442b7ac44fc953080321aa3e08ab684ee50d80
Xin Li [Fri, 10 May 2019 00:59:03 +0000 (17:59 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into " am:
7bd0d9e0c3 -s ours
am:
4be54ee7bf -s ours
am skip reason: subject contains skip directive
Change-Id: I9274b8dc105aed74902d59c2ca38837c05cf13eb
Android Build Merger (Role) [Fri, 10 May 2019 00:50:03 +0000 (00:50 +0000)]
Merge "[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into am:
e39adc7f03 -s ours am:
251879b510 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
Myles Watson [Fri, 10 May 2019 00:40:27 +0000 (17:40 -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:
a1a09e4bf5
Change-Id: Ia66c3003622e415d853876687ed7c52bd5b20c11
Xin Li [Fri, 10 May 2019 00:29:10 +0000 (17:29 -0700)]
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into am:
e39adc7f03 -s ours
am:
251879b510 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifc11e13a9c356f467fcdc6618fbd89477fb66151
TreeHugger Robot [Fri, 10 May 2019 00:21:24 +0000 (00:21 +0000)]
Merge "Add Delay reporting for Hearing Aids" into qt-dev
Xin Li [Thu, 9 May 2019 23:54:54 +0000 (16:54 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "
am:
7bd0d9e0c3 -s ours
am skip reason: subject contains skip directive
Change-Id: I0a6eb0daaa03161d899b838f88945cc06bac056f
Stanley Tng [Thu, 9 May 2019 23:17:27 +0000 (16:17 -0700)]
Merge "Add Delay reporting for Hearing Aids" am:
122ce6871f
am:
9bae14294d
Change-Id: I7377397bbc73484457247961f650a96449213325
Xin Li [Thu, 9 May 2019 23:14:15 +0000 (16:14 -0700)]
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into
am:
e39adc7f03 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie61608aea918084208a6cc25b5f39c9567ee611e
Xin Li [Thu, 9 May 2019 22:05:45 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into "
Stanley Tng [Thu, 9 May 2019 21:45:03 +0000 (14:45 -0700)]
Merge "Add Delay reporting for Hearing Aids"
am:
122ce6871f
Change-Id: If98f6b3faad73841924abdf92b2a4b09ac9411b9
Myles Watson [Thu, 9 May 2019 21:40:46 +0000 (14:40 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3 am:
7642947735 am:
d7a673d47f
am:
5b80ee9db6
Change-Id: Icfcb0bb3ee591fa8ad1d918696e8117fd0d2029d
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 21:07:45 +0000 (14:07 -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:
52836e9963
Change-Id: I0c792174a9a56b233741257d8b3b31923c2a2e9d
Myles Watson [Thu, 9 May 2019 21:06:16 +0000 (14:06 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
c0c3804acd -s ours am:
3f561b74af -s ours
am:
14fa281af5
Change-Id: I462a6ae33eca3d7b40fda3f8e885b5b53440a423
Myles Watson [Thu, 9 May 2019 21:05:16 +0000 (14:05 -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:
99e865fec0
Change-Id: Ifc100125a206c087abc37d7744f6b5b7db76913a
Myles Watson [Thu, 9 May 2019 20:59:21 +0000 (13:59 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3 am:
7642947735
am:
d7a673d47f
Change-Id: I92608bcb41ffaddddebb1e0c1469572fb93f4b24
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
Treehugger Robot [Thu, 9 May 2019 20:51:00 +0000 (20:51 +0000)]
Merge "Add Delay reporting for Hearing Aids"
OSDN Git Service
