OSDN Git Service
Myles Watson [Wed, 3 Apr 2019 02:51:19 +0000 (19:51 -0700)]
Merge "packet: Add Packet classes and tests" am:
a275910a49 am:
257ed53ca9
am:
995361568d
Change-Id: Iad797e8182c3c824cf483249ca5f09be06d7b9c9
Android Build Merger (Role) [Wed, 3 Apr 2019 02:44:21 +0000 (02:44 +0000)]
Merge "Add service change handle for Hearing Aids am:
c410c2e7f1 am:
003b2e01fc am:
d66e625934"
weichinweng [Wed, 3 Apr 2019 02:44:10 +0000 (19:44 -0700)]
Add service change handle for Hearing Aids am:
c410c2e7f1 am:
003b2e01fc
am:
d66e625934
Change-Id: I9fccba58581984864331051972bc3227b031a953
weichinweng [Wed, 3 Apr 2019 02:43:45 +0000 (19:43 -0700)]
Add service change handle for Hearing Aids am:
c410c2e7f1 am:
003b2e01fc
am:
d66e625934
Change-Id: I2fb8650abfdeb14a5df075ed1bd822897f24dc72
Myles Watson [Wed, 3 Apr 2019 02:08:37 +0000 (19:08 -0700)]
Merge "packet: Add Packet classes and tests" am:
a275910a49
am:
257ed53ca9
Change-Id: I42f2095652377e9ac744b6ae31723ce34d78be1a
weichinweng [Wed, 3 Apr 2019 02:06:01 +0000 (19:06 -0700)]
Add service change handle for Hearing Aids am:
c410c2e7f1
am:
003b2e01fc
Change-Id: I68a3874f4bb68eb0019da29934e5966fedcb52c0
Myles Watson [Wed, 3 Apr 2019 01:37:51 +0000 (18:37 -0700)]
Merge "packet: Add Packet classes and tests"
am:
a275910a49
Change-Id: I930470fa3921157afe771cab7f427168c89f6a95
weichinweng [Wed, 3 Apr 2019 01:36:31 +0000 (18:36 -0700)]
Add service change handle for Hearing Aids
am:
c410c2e7f1
Change-Id: I77c2bec2821d939fe8323d64ab051260bf9d57ee
Treehugger Robot [Wed, 3 Apr 2019 01:01:06 +0000 (01:01 +0000)]
Merge "packet: Add Packet classes and tests"
Jakub Pawlowski [Tue, 2 Apr 2019 22:39:28 +0000 (15:39 -0700)]
Fix for GATT not returning disconnect callback. am:
8edcc90e45 am:
5530bf16c2
am:
cb474ec98d
Change-Id: Ia30985ef1ce0a0b55b617b1ea9a116411e4bec74
Jack He [Tue, 2 Apr 2019 22:38:08 +0000 (15:38 -0700)]
Merge "Common: remove GD related stuff from common" am:
98695adc1c am:
a946a72a12
am:
ea973a4cb5
Change-Id: I8b365c79176e0c09e83dd2345ec199e49c61a327
Myles Watson [Mon, 1 Apr 2019 20:21:25 +0000 (13:21 -0700)]
packet: Add Packet classes and tests
Test: atest bluetooth_test_gd
Change-Id: I8e124d5123cff3354f5c451b3806904a2d60b38d
weichinweng [Wed, 20 Mar 2019 10:53:11 +0000 (18:53 +0800)]
Add service change handle for Hearing Aids
When receive service changed indication from Hearing Aid (which indicates
Hearing Aid service changed), it will refresh the hearing aid attribute
handle to ensure the attribute handle is correct.
Bug:
122008481
Test: 1.run unit test
2.After Pair old version FW HearingAid, Disconnect/Reconnect new version
FW HearingAId, then check whether HearingAid is working fine.
3.After Pair old version FW HearingAid, Bluetooth off/on to reconnect
new version FW HearingAId, then check whether HearingAid is working
fine.
Change-Id: I48eae10a3016429f35f4f904752be93bb419d515
Jakub Pawlowski [Tue, 2 Apr 2019 21:57:32 +0000 (14:57 -0700)]
Fix for GATT not returning disconnect callback. am:
8edcc90e45
am:
5530bf16c2
Change-Id: I021a4efbc9aa82cee53f710236f4ff273f744626
Jack He [Tue, 2 Apr 2019 21:56:28 +0000 (14:56 -0700)]
Merge "Common: remove GD related stuff from common" am:
98695adc1c
am:
a946a72a12
Change-Id: I29ece637f8b9e2baa9a9e04270655dd0e3c91de0
TreeHugger Robot [Tue, 2 Apr 2019 21:34:08 +0000 (21:34 +0000)]
Merge "Check HCI_ACL header length"
Jakub Pawlowski [Tue, 2 Apr 2019 21:22:59 +0000 (14:22 -0700)]
Fix for GATT not returning disconnect callback.
am:
8edcc90e45
Change-Id: Ib0e1bf8b76c163eafbd909d81f0137dc9a247d25
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
Jack He [Tue, 2 Apr 2019 20:57:49 +0000 (13:57 -0700)]
Merge "Common: remove GD related stuff from common"
am:
98695adc1c
Change-Id: I13d8f4c471ad366b52740f2d39faf78600e9f9a1
Treehugger Robot [Tue, 2 Apr 2019 20:07:54 +0000 (20:07 +0000)]
Merge "Common: remove GD related stuff from common"
Jack He [Mon, 1 Apr 2019 23:20:14 +0000 (16:20 -0700)]
Common: remove GD related stuff from common
* Remove reactor, thread, handler, alarm, repeating alarm from common/
since they are already copied into gd/os
* Extract thread and alarm benchmarks into gd:bluetooth_benchmark_gd
* Enable host side unit tests for system/bt in TEST_MAPPING
Bug:
129537494
Test: run benchmark, run unit tests
Change-Id: Id5d7592067bab3275976dfc710e4d751c43b9df8
Greg Kaiser [Tue, 2 Apr 2019 18:08:05 +0000 (11:08 -0700)]
Avoid using erase()d iterator am:
120f377694 am:
d91ef79ae7
am:
abd9d89f40
Change-Id: I42cb18d11c30a061f16ee13c781b21fc86956a32
Greg Kaiser [Tue, 2 Apr 2019 18:07:43 +0000 (11:07 -0700)]
btif_storage: Avoid extra std::string copies am:
709a29f9e9 am:
f6dc9ad977
am:
cc87e84c65
Change-Id: Ic5d4f9e69d2f4b2fa3b0a849b655a5f345c9818e
Greg Kaiser [Tue, 2 Apr 2019 17:35:52 +0000 (10:35 -0700)]
Avoid using erase()d iterator am:
120f377694
am:
d91ef79ae7
Change-Id: I695790afdba58fc51cb12370b2632ece77d4b436
Greg Kaiser [Tue, 2 Apr 2019 17:35:23 +0000 (10:35 -0700)]
btif_storage: Avoid extra std::string copies am:
709a29f9e9
am:
f6dc9ad977
Change-Id: I1acf598e920d70da086aa20dcbd95cc2fa485f49
Greg Kaiser [Tue, 2 Apr 2019 17:02:47 +0000 (10:02 -0700)]
Avoid using erase()d iterator
am:
120f377694
Change-Id: I5039b59eae6da98daa35581a51ed9112d9cb1d73
Greg Kaiser [Tue, 2 Apr 2019 17:02:34 +0000 (10:02 -0700)]
btif_storage: Avoid extra std::string copies
am:
709a29f9e9
Change-Id: I5867967366a9e17af8529153d7ea37f7bd78e72d
Greg Kaiser [Mon, 1 Apr 2019 13:47:23 +0000 (06:47 -0700)]
Avoid using erase()d iterator
After calling erase(it), 'it' is no longer valid and should not be
used as it was in the 'it++' of the 'for' loop. We change to
update 'it' to the result of erase(), and only perform 'it++' if
we're not erasing it.
Test: TreeHugger
Change-Id: If7889fdca76a6883aeb4341be1a6fff466585e29
Greg Kaiser [Tue, 26 Mar 2019 16:09:28 +0000 (09:09 -0700)]
btif_storage: Avoid extra std::string copies
When a function takes a const std::string reference for an
argument, it's inefficient to pass in std::string::c_str().
Test: TreeHugger
Change-Id: Ibd00c10a08ab853875fd16739bce5851f6b42639
Yi Kong [Tue, 2 Apr 2019 08:42:13 +0000 (01:42 -0700)]
Merge "Fix use of uninitialised variable" am:
52b5f32e07 am:
0c80cbcda5
am:
be18e1cc64
Change-Id: If4857a8f3ab8d024e0e2358f377e104437b61757
Yi Kong [Tue, 2 Apr 2019 08:24:19 +0000 (01:24 -0700)]
Merge "Fix use of uninitialised variable" am:
52b5f32e07
am:
0c80cbcda5
Change-Id: I283c56324359e9cdb5399860498392a4fb4294d7
Yi Kong [Tue, 2 Apr 2019 08:16:31 +0000 (01:16 -0700)]
Merge "Fix use of uninitialised variable"
am:
52b5f32e07
Change-Id: I315935b706a7386547caac06c8e8f981e71e7431
Yi Kong [Tue, 2 Apr 2019 08:04:02 +0000 (08:04 +0000)]
Merge "Fix use of uninitialised variable"
Hansong Zhang [Tue, 2 Apr 2019 04:32:04 +0000 (21:32 -0700)]
Merge "Disable Link layer socket device test in rootcanal" am:
460d035101 am:
38383e6aac
am:
946b86e232
Change-Id: Iee48bb4f3146effba2760a84055e70967c096a80
Hansong Zhang [Tue, 2 Apr 2019 04:28:49 +0000 (21:28 -0700)]
Merge "Disable Link layer socket device test in rootcanal" am:
460d035101
am:
38383e6aac
Change-Id: If5cec54274c84543ee09e3b0a4eeba2509372bdc
Hansong Zhang [Tue, 2 Apr 2019 04:23:36 +0000 (21:23 -0700)]
Merge "Disable Link layer socket device test in rootcanal"
am:
460d035101
Change-Id: Id72df7c7f5336a337575c4bc29c5f0cee15b4d53
Treehugger Robot [Tue, 2 Apr 2019 04:14:33 +0000 (04:14 +0000)]
Merge "Disable Link layer socket device test in rootcanal"
Weichin Weng [Tue, 2 Apr 2019 02:53:04 +0000 (19:53 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"" am:
864fe7ad39 -s ours am:
7421a10f21 -s ours
am:
87bdbf8264 -s ours
am skip reason: subject contains skip directive
Change-Id: I8e789d0d62cc2c8082892905030f778146a8705c
Weichin Weng [Tue, 2 Apr 2019 02:31:23 +0000 (19:31 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"" am:
864fe7ad39 -s ours
am:
7421a10f21 -s ours
am skip reason: subject contains skip directive
Change-Id: I3a08d4f7b73e6aae0d1856b573b3a29079bf1beb
Weichin Weng [Tue, 2 Apr 2019 02:14:04 +0000 (19:14 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist""
am:
864fe7ad39 -s ours
am skip reason: subject contains skip directive
Change-Id: I5c1ff1bbe0f3c7fc665e6f89d4eabebecd26a961
Weichin Weng [Tue, 2 Apr 2019 01:48:09 +0000 (01:48 +0000)]
Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist""
Hansong Zhang [Mon, 1 Apr 2019 23:33:52 +0000 (16:33 -0700)]
Disable Link layer socket device test in rootcanal
Test: presubmit
Bug:
129537494
Change-Id: I852da314ab65052a0e1a794f5faa9f21e1249efe
Zach Johnson [Mon, 1 Apr 2019 21:55:28 +0000 (14:55 -0700)]
Merge "Fix assert macro logical inversion" am:
c5b38fae53 am:
4bcfcf5bb9
am:
0d1725218f
Change-Id: Ie6cf044bc8ef733ba079cd99d75798d18ba20b9f
Zach Johnson [Mon, 1 Apr 2019 21:37:18 +0000 (14:37 -0700)]
Merge "Fix assert macro logical inversion" am:
c5b38fae53
am:
4bcfcf5bb9
Change-Id: I6a5a16e155a021cfbd3d631dc3421f694d37f9e0
Zach Johnson [Mon, 1 Apr 2019 21:15:17 +0000 (14:15 -0700)]
Merge "Fix assert macro logical inversion"
am:
c5b38fae53
Change-Id: I1651a93c09137f8a5d159cf056d3ea3d0c115831
Zach Johnson [Mon, 1 Apr 2019 20:12:03 +0000 (20:12 +0000)]
Merge "Fix assert macro logical inversion"
Zach Johnson [Fri, 29 Mar 2019 19:45:50 +0000 (12:45 -0700)]
Fix assert macro logical inversion
Rename FATAL_WHEN to ASSERT and LOG_FATAL_WHEN to ASSERT_LOG
Test: atest
Change-Id: I0e6e15ce7cfbb89e76910181f164e8ff32abc033
weichinweng [Fri, 29 Mar 2019 06:07:52 +0000 (14:07 +0800)]
Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"
This reverts commit
d65f697c011cc6e5eaad767de3ec726cfd25b27f.
This CL is merge into AOSP in error due to the block copy from
pi-dev-plus-aosp
Test: run unit test
Change-Id: I9e206465e832d263084895b7c7b808df4573f986
Merged-In: Iab11567fa326b6837a621c1edc93e0eceb04ec43
Yi Kong [Fri, 29 Mar 2019 23:15:50 +0000 (16:15 -0700)]
Fix use of uninitialised variable
The fallthrough code path on L264 does not initialise the type variable
but it is used on L270.
Test: m checkbuild
Bug:
129566813
Change-Id: I18eb3b9be1712bac844aeb804ab76b218580c4b6
Hansong Zhang [Fri, 29 Mar 2019 16:34:15 +0000 (09:34 -0700)]
Merge "Fix potential null point dereference" am:
6bb3296e5e am:
772792cc92
am:
a57394dea3
Change-Id: Icd2f1f27ec5ce69e6cea4253669154112d03897f
Hansong Zhang [Fri, 29 Mar 2019 16:27:35 +0000 (09:27 -0700)]
Merge "Fix potential null point dereference" am:
6bb3296e5e
am:
772792cc92
Change-Id: Ifbca848708d71ee96f2779428019eed2e7812df5
Hansong Zhang [Fri, 29 Mar 2019 16:20:02 +0000 (09:20 -0700)]
Merge "Fix potential null point dereference"
am:
6bb3296e5e
Change-Id: I92ba1186cf0517023faafc1251b34bc513522000
Hansong Zhang [Fri, 29 Mar 2019 15:55:25 +0000 (15:55 +0000)]
Merge "Fix potential null point dereference"
Ted Wang [Fri, 29 Mar 2019 08:20:27 +0000 (16:20 +0800)]
Fix potential null point dereference
Use find() to check element in map to avoid unknow element been insert
into map causing null point dereference.
Bug:
121310341
Test: Manual connect/disconnect headset
Change-Id: If127086ec4beb9b735ef3c72456e8e2209826b57
Zach Johnson [Fri, 29 Mar 2019 01:33:05 +0000 (18:33 -0700)]
Merge changes Ice4cee21,I6e579811,Ieae0cb21 am:
7c12a1727d am:
3bd346c073
am:
80d14e9cc0
Change-Id: I6fec501b4cb128c76f8a963e408f415fe35cffc3
Zach Johnson [Fri, 29 Mar 2019 01:24:17 +0000 (18:24 -0700)]
Merge changes Ice4cee21,I6e579811,Ieae0cb21 am:
7c12a1727d
am:
3bd346c073
Change-Id: Iec7d3c6ae247218b18c7ce23c574979e41115292
Zach Johnson [Fri, 29 Mar 2019 01:20:26 +0000 (18:20 -0700)]
Merge changes Ice4cee21,I6e579811,Ieae0cb21
am:
7c12a1727d
Change-Id: Ie2fd9170d55c4ef2cf2a7b7864489e37dac17e6a
Zach Johnson [Fri, 29 Mar 2019 01:15:40 +0000 (01:15 +0000)]
Merge changes Ice4cee21,I6e579811,Ieae0cb21
* changes:
RootCanal: Add more scripts
RootCanal: Desktop simulation envrionment
RootCanal: New Directory Structure
Zach Johnson [Fri, 29 Mar 2019 01:06:27 +0000 (18:06 -0700)]
Merge "Get gd os tests running on host" am:
d4e4cc2f51 am:
8acdb3bf05
am:
20cebc5acf
Change-Id: I4617e97e377386d014ab742944c03c3d5538afc8
Zach Johnson [Fri, 29 Mar 2019 00:57:11 +0000 (17:57 -0700)]
Merge "Get gd os tests running on host" am:
d4e4cc2f51
am:
8acdb3bf05
Change-Id: I88a93a21cc6a160db59131113a4871112545d476
Zach Johnson [Fri, 29 Mar 2019 00:50:06 +0000 (17:50 -0700)]
Merge "Get gd os tests running on host"
am:
d4e4cc2f51
Change-Id: Icc5eb98cf87d1311b35a5730b5497a290cdace2d
Zach Johnson [Fri, 29 Mar 2019 00:37:33 +0000 (00:37 +0000)]
Merge "Get gd os tests running on host"
Hansong Zhang [Thu, 28 Mar 2019 22:18:07 +0000 (15:18 -0700)]
Merge "Run code coverage only on host target" am:
36277fcc67 am:
97545bb393
am:
b7396b73fc
Change-Id: If387668d04a037223ac6b44372d2c4a40ff7fcdc
Hansong Zhang [Thu, 28 Mar 2019 22:09:05 +0000 (15:09 -0700)]
Merge "Run code coverage only on host target" am:
36277fcc67
am:
97545bb393
Change-Id: I4765a1209e247ccf9d1a19f17cc7a7a9b6a8c26e
Hansong Zhang [Thu, 28 Mar 2019 22:02:52 +0000 (15:02 -0700)]
Merge "Run code coverage only on host target"
am:
36277fcc67
Change-Id: I8dabacad4bc7c30001a55827c8f976704a89d549
Myles Watson [Thu, 7 Feb 2019 23:21:25 +0000 (15:21 -0800)]
RootCanal: Add more scripts
Test: Connect to HCI sockets and LinkLayer sockets
Change-Id: Ice4cee21f295bbb3a3fe35cfe44073028e65d811
Myles Watson [Wed, 13 Feb 2019 20:36:32 +0000 (12:36 -0800)]
RootCanal: Desktop simulation envrionment
Test: nativetest64/root-canal/root-canal [TEST_PORT] [HCI_PORT] [LINK_PORT]
python scripts/test_channel.py
Change-Id: I6e57981182c392366d7d97249d837694b49dfa4e
Myles Watson [Fri, 18 Jan 2019 19:42:33 +0000 (11:42 -0800)]
RootCanal: New Directory Structure
model/controller/ contains the simulated chip
model/devices/ contains simulated devices
model/setup/ contains the test model
packets/link_layer/ contains the fake LMP packets
Test: cts-verifier Insecure RFCOMM test
LinkLayerPacketBuilderTest
rootcanal-packets_test_host
Change-Id: Ieae0cb21f7d57c03797f800797cedae59dd70e49
Zach Johnson [Thu, 28 Mar 2019 02:15:38 +0000 (19:15 -0700)]
Get gd os tests running on host
* Run os tests on host
* Fix flaky hander clear test
* Move to linux_generic
* Remove dependency on libchrome
* Allow alarms to run on linux host where we can't get CAP_WAKE_ALARM
Test: atest bluetooth_gd_test_os
Change-Id: Ia95ce39169ac8c963052e3252e7b39ef32bd5bb1
Treehugger Robot [Thu, 28 Mar 2019 21:42:33 +0000 (21:42 +0000)]
Merge "Run code coverage only on host target"
Hansong Zhang [Wed, 27 Mar 2019 22:49:13 +0000 (15:49 -0700)]
Run code coverage only on host target
Bug:
129421924
Test: run code coverage
Change-Id: I1dc681c72d8af29e43ccb1441ffd218059b8056c
Jack He [Thu, 28 Mar 2019 17:35:59 +0000 (10:35 -0700)]
[automerger skipped] Merge "Log encryption key size" into pi-dev-plus-aosp
am:
c4bab44041 -s ours
am skip reason: change_id I6274f244a6f03d2a0054e985d7daf8104c8cdfe7 with SHA1
250d581700 is in history
Change-Id: I65df95725cc356a782c2533151e6f8d1c9945edf
TreeHugger Robot [Thu, 28 Mar 2019 17:30:37 +0000 (17:30 +0000)]
Merge "Log encryption key size" into pi-dev-plus-aosp
Ray Kuo [Thu, 28 Mar 2019 16:56:27 +0000 (09:56 -0700)]
Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature." am:
c19e159920 am:
555329a4ae
am:
4ad7677034
Change-Id: I380637fe7bbbd6b3b58fb7c05db929978ae08bc7
Ray Kuo [Thu, 28 Mar 2019 16:52:32 +0000 (09:52 -0700)]
Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature." am:
c19e159920
am:
555329a4ae
Change-Id: I594738be1148f77e55e62deba96b2503b3caaad8
Ray Kuo [Thu, 28 Mar 2019 16:48:48 +0000 (09:48 -0700)]
Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature."
am:
c19e159920
Change-Id: Ieb9dfdb35d8740114c2a94e0453de6762ef4ecc9
Treehugger Robot [Thu, 28 Mar 2019 16:37:55 +0000 (16:37 +0000)]
Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature."
Zach Johnson [Thu, 28 Mar 2019 03:27:14 +0000 (20:27 -0700)]
Merge "Only use the new format in gd/" am:
8b3df83108 am:
56365bdb6a
am:
218fc52e5b
Change-Id: Ie5ce7acd736a974c019f9fd684b98f2f889353db
Zach Johnson [Thu, 28 Mar 2019 03:24:09 +0000 (20:24 -0700)]
Merge "Only use the new format in gd/" am:
8b3df83108
am:
56365bdb6a
Change-Id: I65214b102aaa19c0a17d6de53a1daae5c26f0dd2
Zach Johnson [Thu, 28 Mar 2019 03:19:58 +0000 (20:19 -0700)]
Merge "Only use the new format in gd/"
am:
8b3df83108
Change-Id: I4129cc39765902b3aec64180c814e8105ef95693
Zach Johnson [Thu, 28 Mar 2019 03:09:39 +0000 (03:09 +0000)]
Merge "Only use the new format in gd/"
Jack He [Wed, 20 Mar 2019 20:31:58 +0000 (13:31 -0700)]
Log encryption key size
* Log result from HCI_READ_ENCR_KEY_SIZE command
Bug:
124301137
Test: test drive with statsd
Change-Id: Ifa195887284a22225a1b71d5a78a25cb8776647e
Merged-In: I6274f244a6f03d2a0054e985d7daf8104c8cdfe7
(cherry picked from commit
250d58170014667f5fca44ee8e73f4bf85165e56)
Hansong Zhang [Wed, 27 Mar 2019 22:54:36 +0000 (15:54 -0700)]
Merge "Copy reactor classes to new directory" am:
10a6432c6a am:
696ed422c7
am:
5d2965062c
Change-Id: I880995baa70364433fa4e217bde96056b981d092
Hansong Zhang [Wed, 27 Mar 2019 22:46:11 +0000 (15:46 -0700)]
Merge "Copy reactor classes to new directory" am:
10a6432c6a
am:
696ed422c7
Change-Id: I6346249cc180fb85ec0514f43c248478d381752c
Hansong Zhang [Wed, 27 Mar 2019 22:41:57 +0000 (15:41 -0700)]
Merge "Copy reactor classes to new directory"
am:
10a6432c6a
Change-Id: If973570cbc40c3110cb9a0caa63ad2c461523aa6
Treehugger Robot [Wed, 27 Mar 2019 22:32:09 +0000 (22:32 +0000)]
Merge "Copy reactor classes to new directory"
Myles Watson [Wed, 27 Mar 2019 22:26:49 +0000 (15:26 -0700)]
Only use the new format in gd/
Test: Upload a change with long lines
Change-Id: Iba4a08f9556219bfada9a13272463acbf7ddbdce
Cheney Ni [Wed, 27 Mar 2019 22:08:51 +0000 (15:08 -0700)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled" am:
2ef65b9065 am:
f9979befa5
am:
3b0c8a5412
Change-Id: I9449e0016cd7c66fab0c3dfb97bbc46d139833ea
Cheney Ni [Wed, 27 Mar 2019 21:50:04 +0000 (14:50 -0700)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled" am:
2ef65b9065
am:
f9979befa5
Change-Id: I8d1674fb2ecbac4b06fc6c6ed95e7c26c72a58d4
Cheney Ni [Wed, 27 Mar 2019 21:34:30 +0000 (14:34 -0700)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled"
am:
2ef65b9065
Change-Id: Ic82f8948428d14e4761892ad53334b2bacdd00d3
Treehugger Robot [Wed, 27 Mar 2019 21:07:29 +0000 (21:07 +0000)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled"
Hansong Zhang [Tue, 19 Mar 2019 23:17:42 +0000 (16:17 -0700)]
Copy reactor classes to new directory
Test: compile and run unit test
Change-Id: Ie704bf6b80f24bcae86d557ca351a893dcf8bdfa
Hansong Zhang [Wed, 27 Mar 2019 17:53:10 +0000 (10:53 -0700)]
Merge "Hearing aid: use new common/Timer" am:
39eba7165c am:
ffb36c2132
am:
59fee7d56d
Change-Id: If9b8a3ec1eaf0018a2b1ef4fd5afa46741014bb2
Hansong Zhang [Wed, 27 Mar 2019 17:49:04 +0000 (10:49 -0700)]
Merge "Hearing aid: use new common/Timer" am:
39eba7165c
am:
ffb36c2132
Change-Id: Icd5b8b69c752238295f60d8adbc6df21b0cbe85f
Hansong Zhang [Wed, 27 Mar 2019 17:44:20 +0000 (10:44 -0700)]
Merge "Hearing aid: use new common/Timer"
am:
39eba7165c
Change-Id: I31592f1e4ea83cb41e94b50ce76c1e578dffa35c
Treehugger Robot [Wed, 27 Mar 2019 17:26:06 +0000 (17:26 +0000)]
Merge "Hearing aid: use new common/Timer"
Cheney Ni [Wed, 27 Mar 2019 12:58:49 +0000 (20:58 +0800)]
A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled
When using BluetoothA2dp / BluetoothAudio HAL, the UIPC won't be used,
and is no need to do the initialization. If it is up, there will be an
uipc-main thread running, and we have to release by the UIPC_Close API
before the A2DP source restarting. If we are acquiring a new one before
released, some of its resource will be leaked, and causes the stack
abnormal.
Bug:
128256722
Test: Check uipc-main is running when using the legacy HAL only
Change-Id: Icc8ea102d29c92b58c77099979d17e85e5cb9a83
Martin Stjernholm [Wed, 27 Mar 2019 13:51:41 +0000 (06:51 -0700)]
[automerger skipped] Revert "DO NOT MERGE Log encryption key size"
am:
1a050237b7 -s ours
am skip reason: subject contains skip directive
Change-Id: I00d57d2b52fcac841851f1c391a9d476f3bfdc4d
Martin Stjernholm [Wed, 27 Mar 2019 12:38:34 +0000 (12:38 +0000)]
Revert "DO NOT MERGE Log encryption key size"
This reverts commit
fecbda5ef469c46391430ffa7aa604f5e947c258.
Reason for revert: Breaks aosp_*-userdebug targets
Bug:
129387219
Change-Id: I90934b68a1ddabb5666820fbae87aeb647a5c36c
Jack He [Wed, 27 Mar 2019 10:54:09 +0000 (03:54 -0700)]
[automerger skipped] DO NOT MERGE Log encryption key size
am:
fecbda5ef4 -s ours
am skip reason: subject contains skip directive
Change-Id: If306e99e1afd0ac97436a16f4f2722918ee03530
OSDN Git Service
