OSDN Git Service
Chienyuan [Thu, 11 Jul 2019 18:59:56 +0000 (11:59 -0700)]
Merge "GD HCI:Wait channel ready after stop/start server" am:
0ce82d0756 am:
6d70fa271e
am:
715b6d25e5
Change-Id: I46fe46db2f0c9e855df5d60c9c2ce8b071773b78
Chienyuan [Thu, 11 Jul 2019 18:51:01 +0000 (11:51 -0700)]
Merge "GD HCI:Wait channel ready after stop/start server" am:
0ce82d0756
am:
6d70fa271e
Change-Id: I4e98a1369a73f2711009af42f67001c28378e08b
Chienyuan [Thu, 11 Jul 2019 18:41:47 +0000 (11:41 -0700)]
Merge "GD HCI:Wait channel ready after stop/start server"
am:
0ce82d0756
Change-Id: Ibe180f6eaa01f2db430a927377b7a5733c81f802
Treehugger Robot [Thu, 11 Jul 2019 18:11:12 +0000 (18:11 +0000)]
Merge "GD HCI:Wait channel ready after stop/start server"
Xin Li [Thu, 11 Jul 2019 07:24:09 +0000 (00:24 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am:
9b28b277ea -s ours am:
a225b60cfc -s ours
am:
a37323271e
Change-Id: I4db43a8c754c03704b8e3c0e29f3cc404b003140
Xin Li [Thu, 11 Jul 2019 07:14:04 +0000 (00:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am:
9b28b277ea -s ours
am:
a225b60cfc -s ours
am skip reason: subject contains skip directive
Change-Id: I7c52ea2e287dd26351b66b5f28c8401487acad2a
Xin Li [Thu, 11 Jul 2019 06:59:31 +0000 (23:59 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
am:
9b28b277ea -s ours
am skip reason: subject contains skip directive
Change-Id: I4be39a5d1dc09e7b3613974fc256027eae366663
Chienyuan [Thu, 11 Jul 2019 06:30:20 +0000 (14:30 +0800)]
GD HCI:Wait channel ready after stop/start server
When running multiple tests, the second test will always fail due to
client send rpc request before channel ready. Add wait_channel_ready
function to GdDeviceBase and use it to check channel ready when each
testcase start.
Bug:
136577370
Test: run run_cert.sh
Change-Id: I708035a21b43bcdef80ef45644205648b08cd074
Xin Li [Thu, 11 Jul 2019 05:52:43 +0000 (22:52 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am:
bc2da6ff22 -s ours am:
5f392dfa27 -s ours
am:
8d0105775d
Change-Id: If34dac5be9931ff68c4e9b584548efeab16f62e4
Xin Li [Thu, 11 Jul 2019 05:17:42 +0000 (22:17 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am:
bc2da6ff22 -s ours
am:
5f392dfa27 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib6d1b12beb924ee3333a2fae3d7332a1ac83f47b
Xin Li [Thu, 11 Jul 2019 04:22:39 +0000 (21:22 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am:
bc2da6ff22 -s ours
am skip reason: subject contains skip directive
Change-Id: I43859141fd5c6f196bb728b56495502836c938dc
Treehugger Robot [Thu, 11 Jul 2019 03:52:58 +0000 (03:52 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
Andre Eisenbach [Wed, 10 Jul 2019 21:25:31 +0000 (14:25 -0700)]
Merge "Add log entry to interop_match_name()" am:
a6646fcb9c am:
e590a487d6
am:
dff8c89245
Change-Id: If0427bcc215edfd2e97109862f6de2dfc2f101cc
Andre Eisenbach [Wed, 10 Jul 2019 21:07:29 +0000 (14:07 -0700)]
Merge "Add log entry to interop_match_name()" am:
a6646fcb9c
am:
e590a487d6
Change-Id: Ic2ace3d306cdc75c365b973ea17e50111759614d
Andre Eisenbach [Wed, 10 Jul 2019 20:45:53 +0000 (13:45 -0700)]
Merge "Add log entry to interop_match_name()"
am:
a6646fcb9c
Change-Id: I0fdf90ac384419e327262c42697ce6e482d1cd52
Andre Eisenbach [Wed, 10 Jul 2019 20:41:56 +0000 (13:41 -0700)]
Switch Nintendo workaround to match by name am:
c14c14fbc4
am:
8302b14c71
Change-Id: Ic0a414326084286dda5dd9bd36630e8cb19bf9c4
Andre Eisenbach [Wed, 10 Jul 2019 20:41:26 +0000 (13:41 -0700)]
Switch Nintendo workaround to match by name am:
c14c14fbc4
am:
8dee2787fc
Change-Id: Idf774098d4ff37c5b252eafc8361f42d567d9d21
Android Build Merger (Role) [Wed, 10 Jul 2019 20:41:14 +0000 (20:41 +0000)]
Merge "Match Nintento Pro Controller by name for interop am:
b71ebf2d82 am:
34a08c841d" into qt-r1-dev-plus-aosp
Andre Eisenbach [Wed, 10 Jul 2019 20:41:03 +0000 (13:41 -0700)]
Match Nintento Pro Controller by name for interop am:
b71ebf2d82
am:
34a08c841d
Change-Id: I897fdfae9cd8829a176ad9bea653cc787ce78bd9
Andre Eisenbach [Wed, 10 Jul 2019 20:41:02 +0000 (13:41 -0700)]
Match Nintento Pro Controller by name for interop am:
b71ebf2d82
am:
1c2a327b69
Change-Id: Iea88f54ea0c4de61154df7c8c5efeba26675bb78
Andre Eisenbach [Wed, 10 Jul 2019 20:30:43 +0000 (13:30 -0700)]
Switch Nintendo workaround to match by name
am:
c14c14fbc4
Change-Id: I89b558a9b3e87b58e15a8358fa66258fc03a882f
Andre Eisenbach [Wed, 10 Jul 2019 20:30:27 +0000 (13:30 -0700)]
Switch Nintendo workaround to match by name
am:
c14c14fbc4
Change-Id: I07a2eb3ef468594cf8eee0628314ed8258ae09c7
Andre Eisenbach [Wed, 10 Jul 2019 20:30:01 +0000 (13:30 -0700)]
Match Nintento Pro Controller by name for interop
am:
b71ebf2d82
Change-Id: Id35c63a18c6d42bf599270689cff1f0046b9107f
Andre Eisenbach [Wed, 10 Jul 2019 20:30:00 +0000 (13:30 -0700)]
Match Nintento Pro Controller by name for interop
am:
b71ebf2d82
Change-Id: I683d6dabefeeed51e1a1e9919d3c1b1d28a47647
Andre Eisenbach [Wed, 10 Jul 2019 18:17:10 +0000 (18:17 +0000)]
Merge "Add log entry to interop_match_name()"
weichinweng [Wed, 10 Jul 2019 09:11:04 +0000 (02:11 -0700)]
[automerger skipped] Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support
am:
a2bb603ac6 -s ours
am skip reason: change_id Ib410a8885f3a68c361bb97d5c9a3833f2a1be528 with SHA1
554c3598db is in history
Change-Id: I740121cb979835c2240f35ca80a39f017140ccae
Hansong Zhang [Wed, 10 Jul 2019 03:05:57 +0000 (20:05 -0700)]
Merge "ACL manager cert" am:
33ae129b60 am:
d3eb1c79b7
am:
59c79f9fcd
Change-Id: I1d2a235c0f052e63944fe3ba02543a4cc4ff0f38
Hansong Zhang [Wed, 10 Jul 2019 02:54:58 +0000 (19:54 -0700)]
Merge "ACL manager cert" am:
33ae129b60
am:
d3eb1c79b7
Change-Id: Id7f5e1ac037c8076bff1ac39317a6b476a12d6d8
Hansong Zhang [Wed, 10 Jul 2019 02:45:55 +0000 (19:45 -0700)]
Merge "ACL manager cert"
am:
33ae129b60
Change-Id: Ia817e5feeb24b1a8e64590dcd34e109a485453f3
Treehugger Robot [Wed, 10 Jul 2019 02:38:58 +0000 (02:38 +0000)]
Merge "ACL manager cert"
weichinweng [Wed, 3 Jul 2019 09:52:19 +0000 (17:52 +0800)]
Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support
Set the BLE phy to 2M if the BT controller and peer Hearing Aid device
indicate phy 2M support, otherwise, use default phy channel.
Bug:
135769508
Test: 1.Forget/Repair Hearing Aid device check whether phy is expected.
2.Disconnect/Reconnect Hearing Aid device check whether phy is expected.
3.HearingAid device power off/on, check whether phy is expected.
Change-Id: Ib410a8885f3a68c361bb97d5c9a3833f2a1be528
Merged-In: Ib410a8885f3a68c361bb97d5c9a3833f2a1be528
(cherry picked from commit
554c3598db5661ac0166eb12006d248a38723db1)
Myles Watson [Wed, 10 Jul 2019 01:02:48 +0000 (18:02 -0700)]
Merge "PDL: Add variable-size CustomField(s)" am:
38c5ec9cea am:
b5b7bdf2c8
am:
f6243b264e
Change-Id: Ia1cc83bcc0f3e7582cee64768ab01137d15c9d6b
Myles Watson [Wed, 10 Jul 2019 01:02:22 +0000 (18:02 -0700)]
Merge "PDL: Add ParentDef for packets" am:
df764fc25e am:
74b3e52362
am:
71345c87b5
Change-Id: Ifcc1fc3eabb227dfd5f2276ab6055a1ab6a93e74
Myles Watson [Wed, 10 Jul 2019 01:01:36 +0000 (18:01 -0700)]
Merge "PDL: Move GenInclude and GenUsing to CustomDef" am:
2e1fe86ab1 am:
23aa0183b7
am:
86b17e1b36
Change-Id: Ic18e8bbfbfe37d1c52b3a8b4bf8d53a6ab1e351f
Myles Watson [Wed, 10 Jul 2019 00:52:42 +0000 (17:52 -0700)]
Merge "PDL: Add variable-size CustomField(s)" am:
38c5ec9cea
am:
b5b7bdf2c8
Change-Id: I7f8bd4cc447cef7ae1c0688db91b9fc18bb49553
Myles Watson [Wed, 10 Jul 2019 00:52:07 +0000 (17:52 -0700)]
Merge "PDL: Add ParentDef for packets" am:
df764fc25e
am:
74b3e52362
Change-Id: I650de4cdf992ca62442804b5f7cb921f5a1a65e8
Myles Watson [Wed, 10 Jul 2019 00:51:36 +0000 (17:51 -0700)]
Merge "PDL: Move GenInclude and GenUsing to CustomDef" am:
2e1fe86ab1
am:
23aa0183b7
Change-Id: I643f92207c9a4d2d25de225566a3c3c668873f59
Hansong Zhang [Wed, 10 Jul 2019 00:44:29 +0000 (17:44 -0700)]
Merge "Rootcanal: Implement reject connection request" am:
303e8593f1 am:
19a903fbb2
am:
35c00ad3e2
Change-Id: I51811bf6cfa66888c6394bc8b6ba349b8c0bc81c
Myles Watson [Wed, 10 Jul 2019 00:43:55 +0000 (17:43 -0700)]
Merge "PDL: Add variable-size CustomField(s)"
am:
38c5ec9cea
Change-Id: I129b3990614549795acda47f3b651c5aed0d09d3
Myles Watson [Wed, 10 Jul 2019 00:43:14 +0000 (17:43 -0700)]
Merge "PDL: Add ParentDef for packets"
am:
df764fc25e
Change-Id: I4bc223ec3ac8c7870b99ce061f67d605475ef55a
Myles Watson [Wed, 10 Jul 2019 00:42:36 +0000 (17:42 -0700)]
Merge "PDL: Move GenInclude and GenUsing to CustomDef"
am:
2e1fe86ab1
Change-Id: I30ca03a1bd5a9d947493879b1cae97c469de23f9
Andre Eisenbach [Wed, 10 Jul 2019 00:42:03 +0000 (17:42 -0700)]
Switch Nintendo workaround to match by name am:
34a2667502 am:
4f3523ddbe
am:
50e80f5244
Change-Id: I42c3966a489eee0c7e36e88be17731f164a7014a
Treehugger Robot [Wed, 10 Jul 2019 00:30:41 +0000 (00:30 +0000)]
Merge "PDL: Add variable-size CustomField(s)"
Treehugger Robot [Wed, 10 Jul 2019 00:30:13 +0000 (00:30 +0000)]
Merge "PDL: Add ParentDef for packets"
Treehugger Robot [Wed, 10 Jul 2019 00:26:13 +0000 (00:26 +0000)]
Merge "PDL: Move GenInclude and GenUsing to CustomDef"
Hansong Zhang [Wed, 10 Jul 2019 00:25:59 +0000 (17:25 -0700)]
Merge "Rootcanal: Implement reject connection request" am:
303e8593f1
am:
19a903fbb2
Change-Id: Ida39442b684237fead69a0f796dc72293493e756
Andre Eisenbach [Wed, 10 Jul 2019 00:25:34 +0000 (17:25 -0700)]
Switch Nintendo workaround to match by name am:
34a2667502
am:
4f3523ddbe
Change-Id: I46ef0ac03fd5615f7a321eb34c079ca9f86b4b40
Andre Eisenbach [Tue, 9 Jul 2019 23:59:41 +0000 (16:59 -0700)]
Add log entry to interop_match_name()
Bug:
137141824
Test: manual
Change-Id: Id59d32b31c8915f008ee85920cebd2a06b50c040
Hansong Zhang [Wed, 10 Jul 2019 00:12:51 +0000 (17:12 -0700)]
Merge "Rootcanal: Implement reject connection request"
am:
303e8593f1
Change-Id: Id5d2c0f2fd47a519bcacf29de08683c5352b2624
Andre Eisenbach [Wed, 10 Jul 2019 00:11:40 +0000 (17:11 -0700)]
Switch Nintendo workaround to match by name
am:
34a2667502
Change-Id: Idacf019088ee2e58a137f4fdd94fd5f1e35707a8
Treehugger Robot [Wed, 10 Jul 2019 00:05:59 +0000 (00:05 +0000)]
Merge "Rootcanal: Implement reject connection request"
Xin Li [Tue, 9 Jul 2019 23:54:23 +0000 (16:54 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug:
136196576
Change-Id: I0b01b2d05243625f3c4ae1b3326bae88ea6a9f36
Andre Eisenbach [Mon, 8 Jul 2019 21:49:06 +0000 (14:49 -0700)]
Switch Nintendo workaround to match by name
Bug:
136478524
Test: manual
Change-Id: Ib60cd5adfc4db3ba93fe5ed8c15353225b6cf165
Andre Eisenbach [Mon, 1 Jul 2019 17:48:10 +0000 (10:48 -0700)]
Match Nintento Pro Controller by name for interop
The Nintento Pro Controller uses an unknown number of
BDA ranges (at least 3 found internally). Switching
to name matching...
Bug:
136478524
Test: manual
Change-Id: Ie2dfb700c9550af0c314759ec496a04a8e1aa062
Andre Eisenbach [Mon, 8 Jul 2019 21:49:06 +0000 (14:49 -0700)]
Switch Nintendo workaround to match by name
Bug:
136478524
Test: manual
Change-Id: Ib60cd5adfc4db3ba93fe5ed8c15353225b6cf165
Myles Watson [Tue, 2 Jul 2019 19:02:47 +0000 (12:02 -0700)]
PDL: Add variable-size CustomField(s)
Test: bluetooth_packet_parser_test
Change-Id: I88e3dd2ab4804e8b5a0692d005969640cc110b99
Myles Watson [Tue, 9 Jul 2019 21:09:42 +0000 (14:09 -0700)]
PDL: Add ParentDef for packets
Factor out logic for holding fields in preparation for
structs.
Test: bluetooth_packet_parser_test
Change-Id: Ic9eb6d5387efe5be439a0d6b222c557b05bd3fa9
Myles Watson [Tue, 2 Jul 2019 17:14:47 +0000 (10:14 -0700)]
PDL: Move GenInclude and GenUsing to CustomDef
Test: bluetooth_packet_parser_test
Change-Id: I9ebe10f9d537a254ddd21d62d2c1a23f38e00d0e
Hansong Zhang [Thu, 20 Jun 2019 00:22:21 +0000 (17:22 -0700)]
ACL manager cert
Test: cert/run_cert.sh
Change-Id: I89814224be191fd97a2581b3a36eed67748be7c5
Hansong Zhang [Mon, 8 Jul 2019 22:32:26 +0000 (15:32 -0700)]
Rootcanal: Implement reject connection request
Test: manual
Change-Id: I5413cf83f031b6eb2b83b943c6157f845aa40b2d
android-build-team Robot [Mon, 8 Jul 2019 23:37:32 +0000 (23:37 +0000)]
Snap for
5622519 from
fef57bda2a3cf2dca83848db5b8e789cb32dac1d to pi-platform-release
Change-Id: I6e3b65c572808128485a96f58ce863a1619544fc
Andre Eisenbach [Mon, 8 Jul 2019 20:51:48 +0000 (13:51 -0700)]
Merge "Match Nintento Pro Controller by name for interop" am:
2409830a5c am:
768a4c0094
am:
aa252fd295
Change-Id: I5da5421fe6fac78314bc7ef01ce24d527e4b8767
Andre Eisenbach [Mon, 8 Jul 2019 20:34:22 +0000 (13:34 -0700)]
Merge "Match Nintento Pro Controller by name for interop" am:
2409830a5c
am:
768a4c0094
Change-Id: I75e8f66f2e63881eaa55bcd3b43e278db914b97e
Andre Eisenbach [Mon, 8 Jul 2019 20:21:40 +0000 (13:21 -0700)]
Merge "Match Nintento Pro Controller by name for interop"
am:
2409830a5c
Change-Id: Ie397fa1b663d2db25f09af6ad150b2f1eba12912
Andre Eisenbach [Mon, 8 Jul 2019 20:04:39 +0000 (20:04 +0000)]
Merge "Match Nintento Pro Controller by name for interop"
android-build-team Robot [Mon, 8 Jul 2019 18:26:18 +0000 (18:26 +0000)]
Snap for
5600800 from
2d3cdf31bb8d8452380a3398e57e87f88318a274 to pi-platform-release
Change-Id: I022653b900c4996c7d78dde1b5b4c66beb729b95
Andre Eisenbach [Mon, 1 Jul 2019 17:48:10 +0000 (10:48 -0700)]
Match Nintento Pro Controller by name for interop
The Nintento Pro Controller uses an unknown number of
BDA ranges (at least 3 found internally). Switching
to name matching...
Bug:
136478524
Test: manual
Change-Id: Ie2dfb700c9550af0c314759ec496a04a8e1aa062
Chienyuan [Mon, 8 Jul 2019 17:32:27 +0000 (10:32 -0700)]
Merge "GD:Wait channel ready after stop/start server" am:
c69bb21d5b am:
266cd99b8a
am:
ec147a7b57
Change-Id: Icfcc63cb36a44f387129284fb8df2c4986bed89f
Chienyuan [Mon, 8 Jul 2019 17:23:25 +0000 (10:23 -0700)]
Merge "GD:Wait channel ready after stop/start server" am:
c69bb21d5b
am:
266cd99b8a
Change-Id: I722450e98c391557165b8853d9f3291be69f7ce7
Chienyuan [Mon, 8 Jul 2019 17:14:57 +0000 (10:14 -0700)]
Merge "GD:Wait channel ready after stop/start server"
am:
c69bb21d5b
Change-Id: I487459197e1f9837de99a5e51051c25a08970d04
Treehugger Robot [Mon, 8 Jul 2019 16:46:45 +0000 (16:46 +0000)]
Merge "GD:Wait channel ready after stop/start server"
Chienyuan [Fri, 5 Jul 2019 10:18:56 +0000 (18:18 +0800)]
GD:Wait channel ready after stop/start server
When running multiple tests, the second test will always fail due to
client send rpc request before channel ready. Add wait_channel_ready
function to GdDeviceBase and use it to check channel ready when each
testcase start.
Bug:
136577370
Test: run run_cert.sh
Change-Id: I210dcd69d6e40a315710ba2b8e9e8819e462b42b
weichinweng [Thu, 4 Jul 2019 08:46:42 +0000 (01:46 -0700)]
Merge "Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support" am:
6f27ff477b am:
914784b5f6
am:
65c2594d47
Change-Id: I9e0cbe3fcdc72d36a0973a5dd9e98b8ec6e3543c
weichinweng [Thu, 4 Jul 2019 08:37:39 +0000 (01:37 -0700)]
Merge "Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support" am:
6f27ff477b
am:
914784b5f6
Change-Id: If344b27fbf6c7a2591e76d661331f70c4a5dde11
weichinweng [Thu, 4 Jul 2019 08:28:40 +0000 (01:28 -0700)]
Merge "Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support"
am:
6f27ff477b
Change-Id: I5a8c50bff2481280a13dbe5033bab5eafd98d56a
Treehugger Robot [Thu, 4 Jul 2019 08:00:23 +0000 (08:00 +0000)]
Merge "Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support"
Myles Watson [Wed, 3 Jul 2019 23:49:18 +0000 (16:49 -0700)]
PDL: Add missing quote in matching constraint error am:
25c2cae24d am:
606d9249e3
am:
aa5175ce1a
Change-Id: I749b05470a0f2fa6cfc72f166319893ef0c802eb
Myles Watson [Wed, 3 Jul 2019 23:43:29 +0000 (16:43 -0700)]
[automerger skipped] RootCanal: Set the timer period to 1 second am:
eb9a775086
am:
11ec2ade3c -s ours
am skip reason: change_id I609f917061e5d83e011edfeb61de281ff45b13e4 with SHA1
106fc60a97 is in history
Change-Id: I60e43f83b7bb2fd3889a976a0a135391edceff3c
Myles Watson [Wed, 3 Jul 2019 23:19:10 +0000 (16:19 -0700)]
[automerger skipped] RootCanal: Set the timer period to 1 second am:
eb9a775086 -s ours
am:
d8d0d805c3 -s ours
am skip reason: change_id I609f917061e5d83e011edfeb61de281ff45b13e4 with SHA1
106fc60a97 is in history
Change-Id: I585c83abc20e80ff8d47c13c9451d5fc75504e3a
Myles Watson [Wed, 3 Jul 2019 23:18:25 +0000 (16:18 -0700)]
PDL: Add missing quote in matching constraint error am:
25c2cae24d
am:
606d9249e3
Change-Id: I02bbed15d5762b2546a1f3dd6dfb3c39f0bb760d
Myles Watson [Wed, 3 Jul 2019 23:08:24 +0000 (16:08 -0700)]
RootCanal: Set the timer period to 1 second
am:
eb9a775086
Change-Id: Iaf7e4e6bab48fd9f882c2d0e0c53b1cd71e7ff65
Myles Watson [Wed, 3 Jul 2019 23:08:24 +0000 (16:08 -0700)]
[automerger skipped] RootCanal: Set the timer period to 1 second
am:
eb9a775086 -s ours
am skip reason: change_id I609f917061e5d83e011edfeb61de281ff45b13e4 with SHA1
106fc60a97 is in history
Change-Id: I2914388d1c34943d36b1d8f1dcdcf5a175e7a323
Myles Watson [Wed, 3 Jul 2019 23:08:23 +0000 (16:08 -0700)]
PDL: Add missing quote in matching constraint error
am:
25c2cae24d
Change-Id: I53709ddfdb3af5e5b94aa9ae91bfd9d240527fd5
Myles Watson [Mon, 1 Jul 2019 22:22:26 +0000 (15:22 -0700)]
RootCanal: Set the timer period to 1 second
Reduce the CPU overhead of simulating the Bluetooth chip.
Bug:
136503363
Test: enable Bluetooth with RootCanal
Change-Id: I3a783a4d8a46d4eef43ddbace23c672ef9f6d7f9
Merged-In: I609f917061e5d83e011edfeb61de281ff45b13e4
weichinweng [Wed, 3 Jul 2019 09:52:19 +0000 (17:52 +0800)]
Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support
Set the BLE phy to 2M if the BT controller and peer Hearing Aid device
indicate phy 2M support, otherwise, use default phy channel.
Bug:
135769508
Test: 1.Forget/Repair Hearing Aid device check whether phy is expected.
2.Disconnect/Reconnect Hearing Aid device check whether phy is expected.
3.HearingAid device power off/on, check whether phy is expected.
Change-Id: Ib410a8885f3a68c361bb97d5c9a3833f2a1be528
Myles Watson [Wed, 5 Jun 2019 22:35:52 +0000 (15:35 -0700)]
PDL: Add missing quote in matching constraint error
Test: misspell a constraint and compile a .pdl file
Change-Id: I86aa9a8a4270d4c5fd922c53112ffdf8fc0f86fe
Xin Li [Tue, 2 Jul 2019 18:43:05 +0000 (11:43 -0700)]
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master am:
8212f1324a -s ours
am:
30b5154484
Change-Id: I879d2b7015e8fa5035d6f7f32c116828cb11abc3
Xin Li [Tue, 2 Jul 2019 17:09:39 +0000 (10:09 -0700)]
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
am:
8212f1324a -s ours
am skip reason: subject contains skip directive
Change-Id: I8adfd5fa5ade1481f9d330e858959f307bb1511b
Myles Watson [Mon, 1 Jul 2019 22:41:26 +0000 (15:41 -0700)]
Merge "RootCanal: Make beacons less verbose" into qt-dev am:
155a2373f3
am:
34ce1fe5af
Change-Id: I02e7c7e3298b02632d7bb254903976f4d3df63a6
Myles Watson [Mon, 1 Jul 2019 22:40:57 +0000 (15:40 -0700)]
Merge "RootCanal: Make beacons less verbose" into qt-dev am:
155a2373f3
am:
3ed3319971
Change-Id: Icfda6ba50f6d4bb73458f5cf954bc6a438fedca0
Myles Watson [Mon, 1 Jul 2019 22:31:26 +0000 (15:31 -0700)]
Merge "RootCanal: Make beacons less verbose" into qt-dev
am:
155a2373f3
Change-Id: I45556790bd687e82aa2bd2effc084a5aab1160e0
Myles Watson [Mon, 1 Jul 2019 22:31:26 +0000 (15:31 -0700)]
Merge "RootCanal: Make beacons less verbose" into qt-dev
am:
155a2373f3
Change-Id: I954c6cc25d3948c788d524ccde4a0850770a5802
TreeHugger Robot [Mon, 1 Jul 2019 22:11:59 +0000 (22:11 +0000)]
Merge "RootCanal: Make beacons less verbose" into qt-dev
Xin Li [Mon, 1 Jul 2019 21:00:28 +0000 (21:00 +0000)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
Bug:
134405016
Change-Id: If76b0df5dadd7a1a07863d1ca312d1f31ff3e0fe
Myles Watson [Wed, 26 Jun 2019 17:27:19 +0000 (10:27 -0700)]
RootCanal: Make beacons less verbose
Fixes:
136287879
Test: scan for Bluetooth devices, watch logcat
Change-Id: I971a7e56359adc39d006a1b10b5333c2f31ebaff
(cherry picked from commit
0d5adc6fac590dc14f46790b3962c40712303aea)
Myles Watson [Fri, 28 Jun 2019 22:07:02 +0000 (15:07 -0700)]
[automerger skipped] DO NOT MERGE RootCanal: Always add default devices am:
6160b51adc
am:
0dc155f78d -s ours
am skip reason: change_id I9912dc7a98155972483e1e1dca812ebbae806bdd with SHA1
6160b51adc is in history
Change-Id: I1f7253853629e232d85d5d3fe7c48f700b8b9401
Myles Watson [Thu, 27 Jun 2019 21:26:55 +0000 (14:26 -0700)]
[automerger skipped] DO NOT MERGE RootCanal: Always add default devices am:
6160b51adc -s ours
am:
010d7e5179 -s ours
am skip reason: change_id I9912dc7a98155972483e1e1dca812ebbae806bdd with SHA1
38767e7f97 is in history
Change-Id: I302331b95c9ffa58fd70d102755c27c42c75b130
Myles Watson [Thu, 27 Jun 2019 20:59:00 +0000 (13:59 -0700)]
[automerger skipped] DO NOT MERGE RootCanal: Always add default devices
am:
6160b51adc -s ours
am skip reason: change_id I9912dc7a98155972483e1e1dca812ebbae806bdd with SHA1
38767e7f97 is in history
Change-Id: I6504ba185e795910a4d22baabe5aa2df00622969
Myles Watson [Thu, 27 Jun 2019 20:53:01 +0000 (13:53 -0700)]
DO NOT MERGE RootCanal: Always add default devices
am:
6160b51adc
Change-Id: I11a3328b78eb69c85ab98038aa2558c442d659cb
Myles Watson [Fri, 21 Jun 2019 13:04:08 +0000 (06:04 -0700)]
DO NOT MERGE RootCanal: Always add default devices
Fixes:
129546852
Test: android.bluetooth.cts.BluetoothLeScanTest#testBasicBleScan
Change-Id: I9912dc7a98155972483e1e1dca812ebbae806bdd
(cherry picked from commit
38767e7f973616ecd020e90572d6ddc73e24c5e3)
Merged-In: I9912dc7a98155972483e1e1dca812ebbae806bdd