OSDN Git Service
Ugo Yu [Mon, 13 Aug 2018 07:06:39 +0000 (00:06 -0700)]
Fix wrong UUID mask when doing BLE filter scan am:
0443337239
am:
be2dad6cc0
Change-Id: If227eac7619e89a2cd2cf172e2e2817ae5f66c4f
Ugo Yu [Mon, 13 Aug 2018 07:02:06 +0000 (00:02 -0700)]
Fix wrong UUID mask when doing BLE filter scan
am:
0443337239
Change-Id: I34f2ec2aee8b68f9b2b33c06629960f2f5ab6a5f
Ugo Yu [Mon, 13 Aug 2018 02:12:40 +0000 (10:12 +0800)]
Fix wrong UUID mask when doing BLE filter scan
bug:
112350218
Test: manual
Change-Id: I9e4297b936e7a7db164e7ff3bf680c43600c5bda
Jakub Pawlowski [Thu, 9 Aug 2018 20:18:05 +0000 (13:18 -0700)]
Merge "Get rid of meaningles GATT client error log" am:
783293824c
am:
013a4f4c36
Change-Id: I80e2d68d10e7e562f9d27702e8fa66900fd71b64
Jakub Pawlowski [Thu, 9 Aug 2018 20:10:52 +0000 (13:10 -0700)]
Merge "Get rid of meaningles GATT client error log"
am:
783293824c
Change-Id: I88469907c05719ca895a1d2bd1345b15b9adad47
Treehugger Robot [Thu, 9 Aug 2018 20:00:19 +0000 (20:00 +0000)]
Merge "Get rid of meaningles GATT client error log"
Jakub Pawlowski [Thu, 9 Aug 2018 07:24:41 +0000 (09:24 +0200)]
Get rid of meaningles GATT client error log
Right now we often get this error in logs:
E bt_btif_gattc: btif_gattc_upstreams_evt: Unhandled event (7)!
This is often misinterpreted during log analysis as error, where this
really means just uninteresting event we don't want to handle.
Change-Id: Ia7804b2e1802a117198a31e025d05a80f973e896
Joseph Pirozzo [Wed, 8 Aug 2018 23:26:16 +0000 (16:26 -0700)]
Merge changes from topic "avrcp_controller_timer" am:
f257e0f212
am:
575fa68bef
Change-Id: Ifeb2eab5b34157e0da7f3d7aa1bf7de9c20e2e0e
Joseph Pirozzo [Wed, 8 Aug 2018 23:25:44 +0000 (16:25 -0700)]
AVRCP Controller metadata feature am:
c5232a8bf7
am:
b70218b6d0
Change-Id: Iff13ceb2d145f0d3eb901b6282a16302627f5139
Joseph Pirozzo [Wed, 8 Aug 2018 23:16:21 +0000 (16:16 -0700)]
Merge changes from topic "avrcp_controller_timer"
am:
f257e0f212
Change-Id: If45454464420f71d0c62eb3a9ac84befdee87cd8
Joseph Pirozzo [Wed, 8 Aug 2018 23:15:54 +0000 (16:15 -0700)]
AVRCP Controller metadata feature
am:
c5232a8bf7
Change-Id: I01b9e396a7e81a325487b98e1be79a68101e4898
Joseph Pirozzo [Wed, 8 Aug 2018 23:01:21 +0000 (23:01 +0000)]
Merge changes from topic "avrcp_controller_timer"
* changes:
Reduce Media State change callbacks
AVRCP Controller metadata feature
Pirama Arumuga Nainar [Wed, 8 Aug 2018 18:02:04 +0000 (11:02 -0700)]
Reorder static libs to appease ld.gold linker am:
9f8b1301ad
am:
8438a6350a
Change-Id: Ie2f2bbaee6ebe0b4ceb2b8108612a6b30088884c
Pirama Arumuga Nainar [Wed, 8 Aug 2018 17:37:25 +0000 (10:37 -0700)]
Reorder static libs to appease ld.gold linker
am:
9f8b1301ad
Change-Id: I704fd5b499564a35daf588724aaec8845b9370f3
Xin Li [Wed, 8 Aug 2018 02:07:12 +0000 (19:07 -0700)]
Merge Android Pie into master am:
187c80870b
am:
6ae9abefc4
Change-Id: Ic5e85e2ce25d88168c74154e7e1f46cd23aff1bb
Joseph Pirozzo [Fri, 3 Aug 2018 15:25:19 +0000 (08:25 -0700)]
Reduce Media State change callbacks
Eliminate the 2 second timer and only update media state when it
changes.
Bug:
28917369
Test: Play music, pause and change its position observe status is
correct.
Change-Id: Iaf17e8cde570651706c55603b01c5100d4c60aa4
Xin Li [Tue, 7 Aug 2018 22:38:31 +0000 (15:38 -0700)]
Merge Android Pie into master
am:
187c80870b
Change-Id: I47c453e8c8551c66c27dbbf9d4922c31b8d8552a
Pirama Arumuga Nainar [Tue, 7 Aug 2018 21:43:20 +0000 (14:43 -0700)]
Reorder static libs to appease ld.gold linker
Bug: http://b/
112277682
Bug: http://b/
79419131
Lld, which is the default linker for the platform, is able to resolve
symbols across libraries irrespective of the order they appear in the
command line. This was not the case for ld.gold and other linkers.
Unfortunately, there are some targets that still rely on ld.gold
(pgo-taimen-config1 in internal release branch being one of
them).
With http://aosp/721652, libbt-stack should be added before libbt-common
so MessageLoopThread::~MessageLoopThread is resolved correctly. If not,
the following error is reported by gold:
system/bt/stack/btu/btu_init.cc:41: error: undefined reference to
'bluetooth::common::MessageLoopThread::MessageLoopThread(std::__1::basic_string<char,
std::__1::char_traits<char>, std::__1::allocator<char> > const&)'
Test: m USE_CLANG_LLD=false
Change-Id: I9c8208218ffb4bb027ad75b51bcd484e9bb37368
Joseph Pirozzo [Tue, 7 Aug 2018 19:28:40 +0000 (12:28 -0700)]
AVRCP Controller metadata feature
Process the METADATA feature flag separately from the VENDOR feature
flag to ensure it doesn't get overwritten.
Bug:
110039732
Test: connect avrcp from phone verify getCapabilities events supported
is sent.
Change-Id: Ib5d54c13d6c912904f20e8760f1632fa5737b98f
Xin Li [Mon, 6 Aug 2018 23:52:40 +0000 (16:52 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: I242b3c68bcb25f29f8e979487f507a0585f1a8ae
Jakub Pawlowski [Mon, 6 Aug 2018 18:05:59 +0000 (11:05 -0700)]
Fix bad constructor usage in HearingDevice am:
897a734a47
am:
265e82f00c
Change-Id: If75b1cadedcb601d3d5d3ddd77f0f5539a59ba3d
Jakub Pawlowski [Mon, 6 Aug 2018 18:00:14 +0000 (11:00 -0700)]
Fix bad constructor usage in HearingDevice
am:
897a734a47
Change-Id: I859ce7751ee787fcbf9b5e46f07690a28fa91a1f
Jakub Pawlowski [Mon, 6 Aug 2018 13:48:57 +0000 (15:48 +0200)]
Fix bad constructor usage in HearingDevice
Bug:
112135987
Test: compilation
Change-Id: Ifaf0189f512ef2abdc7179bda5d6ff1e291fde54
Jack He [Fri, 3 Aug 2018 08:39:11 +0000 (01:39 -0700)]
Build: Disable host_supported for cc_benchmark am:
58b49f8c5d
am:
712a461e11
Change-Id: Ib45de2656828817b8c2ab2c3005734f8c0939001
Jack He [Fri, 3 Aug 2018 08:34:36 +0000 (01:34 -0700)]
Build: Disable host_supported for cc_benchmark
am:
58b49f8c5d
Change-Id: I1614d74f1f6980623ef38f00be4a1024a7f8e306
Jack He [Fri, 3 Aug 2018 07:40:56 +0000 (00:40 -0700)]
Build: Disable host_supported for cc_benchmark
* host_supported is broken in cc_benchmark on Mac
Bug:
77585931
Test: make
Change-Id: I2d2b4d52a108f90e3ce2d9c8c9f5510918f1fcff
Jack He [Thu, 2 Aug 2018 21:28:53 +0000 (14:28 -0700)]
Use MessageLoopThread in A2DP source, JNI, BTA, HCI and module bring-up am:
6d110527c8
am:
dd093c9f47
Change-Id: I7daaa4ef57b033ac76f285f973702f88c6c06203
Jack He [Thu, 2 Aug 2018 21:28:27 +0000 (14:28 -0700)]
Add MessageLoopThread, ExecutionBarrier, and performance tests am:
c27d25789b
am:
73cb246f9c
Change-Id: Iba4d02376d4b36edaac77b6b99e35cf4176cec52
Jack He [Thu, 2 Aug 2018 21:24:47 +0000 (14:24 -0700)]
Use MessageLoopThread in A2DP source, JNI, BTA, HCI and module bring-up
am:
6d110527c8
Change-Id: I1093576b83d19cac3a11ff4d81173d97604d2a4d
Jack He [Thu, 2 Aug 2018 21:24:00 +0000 (14:24 -0700)]
Add MessageLoopThread, ExecutionBarrier, and performance tests
am:
c27d25789b
Change-Id: I040d328e642b351420f9a1f4eb35e6c0dc09a74e
Jack He [Thu, 26 Jul 2018 04:43:01 +0000 (21:43 -0700)]
Use MessageLoopThread in A2DP source, JNI, BTA, HCI and module bring-up
* Replace OSI thread with MessageLoopThread in
- btif_a2dp_source (A2DP encoding thread)
- btif_core (JNI thread)
- btu_init (BTA thread)
- hci_layer (HCI thread)
- module (module bring up thread)
- various unit test threads
* Code that uses reactor from OSI thread is not replaced in this change
because they need to move from using reactor to message loop first
* Main difference:
- HCI layer no longer has access to mutex protecting message loop
set up and tear down. Messages posted to thread after ShutDown()
is called become no-op
- In all cases QuitClosure() is used instead of QuitWhenIdleClosure().
This means that we will never force kill a thread. An infinite loop
will delay the shutdown of Bluetooth stack.
* do_in_hci_thread is actually do_in_bta_thread
* Move the definition of do_in_bta_thread from bta to btu since btu is
where the thread actually lives
* Remove bta_closure_api.h and replace it with stack/include/btu.h
* Remove header inclusion in bta_sys.h and include stack/include/btu.h
in individual compilation units
* Fixed a bug in btif_cleanup_bluetooth where btif_jni_disassociate()
was not called on the JNI thread
* Make setting real time priority a requirement
* Crash during the following scenario:
- When btif_profile_queue cleanup failed to be scheduled on JNI thread
- When A2DP encoder thread failed to gain real time priority
- When BTA thread failed to start up
- When BTA thread failed to gain real time priority
- When BTA thread failed to schedule its first callback
* Turn off Bluetooth in the following scenario:
- When HCI thread failed to gain real time priority
- When bt_workqueue thread failed to gain real time priority
Bug:
110303473
Test: make, native and Java unit tests,
Connect to headset and listen to music through A2DP,
testplans/details/184455/3975
Change-Id: Ib448992fc0ba5af82c2d117dd65f1abd45d2acb6
Jack He [Wed, 25 Jul 2018 19:02:22 +0000 (12:02 -0700)]
Add MessageLoopThread, ExecutionBarrier, and performance tests
* Add MessageLoopThread to abstract thread implementation to our code
* Add ExecutionBarrier utility class to help with thread synchronization
* Add more performance tests and performance benchmarks to evaluate
execution efficiency in both batch and sequential usages, for various
thread implementations including:
- libosi reactor on pthread
- MessageLoop on libosi reactor on pthread
- MessageLoop on STL std::thread
- MessageLoop on Posix pthread
- MessageLoop on libchrome base::Thread
- MessageLoop on MessageLoopThread
Bug:
110303473
Test: make, native and Java unit tests,
test/run_benchmarks.sh net_benchmark_thread_performance,
test/run_unit_tests.sh net_test_performance,
test/run_unit_tests.sh bluetooth_test_common,
testplans/details/184455/3975
Change-Id: I5b4ce2ee910a0f1d2edf95e0296916dea04d3f89
Venkata Jagadeesh [Wed, 1 Aug 2018 18:58:45 +0000 (11:58 -0700)]
Merge "Add security handling for LE connection oriented channels" am:
fc53a1fcba
am:
c348d45dd2
Change-Id: Id1c17e86b21ba68c0cf1d8b019ad1dbece4b79b3
Venkata Jagadeesh [Wed, 1 Aug 2018 18:53:41 +0000 (11:53 -0700)]
Merge "Add security handling for LE connection oriented channels"
am:
fc53a1fcba
Change-Id: Ibba4bdb0f337d743a7148d49a1ad23eb2f8a8b5e
Treehugger Robot [Wed, 1 Aug 2018 18:38:10 +0000 (18:38 +0000)]
Merge "Add security handling for LE connection oriented channels"
Aiswarya Cyriac [Tue, 31 Jul 2018 23:36:02 +0000 (16:36 -0700)]
Fix for Bluetooth device name is resetting to default name after reboot am:
f589e45a3c
am:
0391cb76a8
Change-Id: I6c46801a5595db8bb5a5786ce1d70a2bbbea4289
Aiswarya Cyriac [Tue, 31 Jul 2018 23:32:00 +0000 (16:32 -0700)]
Fix for Bluetooth device name is resetting to default name after reboot
am:
f589e45a3c
Change-Id: I313af6b96913b72fc140c7873c1952f24b75c12a
Venkata Jagadeesh [Fri, 18 Mar 2016 06:34:30 +0000 (12:04 +0530)]
Add security handling for LE connection oriented channels
Use case:
Run PTS test cases TP/LE/CFC/BV-10-C to BV-16-C
Steps:
1. These test cases executed with two DUT as PTS support not available
2. Set desired security level on DUT and Remote with tool
3. Initiate LE COC connection request from DUT
Failure:
LE COC connection accepted though even remote security are not met.
Fix:
Added security handling for COC connection
Test: Ran sl4a test for BleCocTest
Change-Id: I5f6385d462698582e701b5a07953c0ccb932bbbf
Aiswarya Cyriac [Mon, 23 Jul 2018 09:47:48 +0000 (15:17 +0530)]
Fix for Bluetooth device name is resetting to default name after reboot
Reason: When the BT device name is updated is getting saved to the
config data pointer but not to the persistent data (i.e. bt_config.conf).
So, when the reboot is happening it is not able to get the updated device
name from the persistent data (i.e. bt_config.conf) as during reboot
bt_config_flush is not called.
Fix: Saving the BT Device name to persistent data using btif_config_flush
once it is set.
Test: Manual Reboot test
Bug:
110301897
Change-Id: Ie329b475eaaf208ed667f27e271a00e230e4b95c
Signed-off-by: Aiswarya Cyriac <aiswarya.cyriac@intel.com>
Signed-off-by: Gaganpreet kaur <gaganpreetx.kaur@intel.com>
Joseph Pirozzo [Mon, 30 Jul 2018 20:55:36 +0000 (13:55 -0700)]
Merge "Set Browsed Player memory allocation" am:
0b610a13c2
am:
f00f987890
Change-Id: Ic47aa119fc8a55459d50e95dce1f53e4cf03cc3d
Joseph Pirozzo [Mon, 30 Jul 2018 20:42:22 +0000 (13:42 -0700)]
Merge "Set Browsed Player memory allocation"
am:
0b610a13c2
Change-Id: I7e432dd8dcc8e389807998e2f07d368414412dd1
Joseph Pirozzo [Mon, 30 Jul 2018 20:31:00 +0000 (20:31 +0000)]
Merge "Set Browsed Player memory allocation"
Pavlin Radoslavov [Fri, 27 Jul 2018 23:58:33 +0000 (16:58 -0700)]
Add additional checks for AVDTP Codec Capabilities am:
3c5cef21d3
am:
2e50343f83
Change-Id: I18a233197d918a7f14a6d2cc34e5ebe9633f2266
Pavlin Radoslavov [Fri, 27 Jul 2018 23:54:27 +0000 (16:54 -0700)]
Add additional checks for AVDTP Codec Capabilities
am:
3c5cef21d3
Change-Id: If9ab310626b5acb2364a2403ba831de3021b5ce2
Joseph Pirozzo [Fri, 27 Jul 2018 18:08:17 +0000 (11:08 -0700)]
Set Browsed Player memory allocation
When setting a browsed player memory for folder depth was incorrectly
allocated based on folder item count not depth.
Bug:
111370532
Test: Set a browsed player that has a depth greater than item count.
Change-Id: I6984c5852f623e7e9478429bdab3dcbcf57196e0
Pavlin Radoslavov [Thu, 26 Jul 2018 02:03:09 +0000 (19:03 -0700)]
Add additional checks for AVDTP Codec Capabilities
Reject AVDTP Codec Capabilities that contain invalid fields
Bug:
110918549
Test: Manual - connect to a device that sends invalid codec capability
Change-Id: Ib697cc9ad13ed666fbafa9219447592fe3f56684
Bailey Forrest [Wed, 25 Jul 2018 00:58:21 +0000 (17:58 -0700)]
Merge "Swap order of registered/status in RegisterForNotificationCallback" am:
95d0798e7f
am:
7df7076194
Change-Id: I16e3e89c8935d1da5ffc470b3d7e686bd05d8dc5
Bailey Forrest [Wed, 25 Jul 2018 00:55:15 +0000 (17:55 -0700)]
Merge "Swap order of registered/status in RegisterForNotificationCallback"
am:
95d0798e7f
Change-Id: Ibe4f75b8eb8b50dd9aaa105bdbafe766bedb8ed4
Treehugger Robot [Wed, 25 Jul 2018 00:45:53 +0000 (00:45 +0000)]
Merge "Swap order of registered/status in RegisterForNotificationCallback"
Joseph Pirozzo [Wed, 25 Jul 2018 00:44:24 +0000 (17:44 -0700)]
Merge "Enable 2-EV3 packets for Wide Band HFP client" am:
503067b5f8
am:
f041e2ada5
Change-Id: I1c323cc063239a010a8b37478b901e486437d18d
Subramanian Srinivasan [Wed, 25 Jul 2018 00:43:51 +0000 (17:43 -0700)]
Merge "Use appropriate Tx time in BLE Set Data length command" am:
135c7bc70c
am:
125c1d8bb9
Change-Id: If16acac34d6500c7f45900e261b6247f423e41d5
Joseph Pirozzo [Wed, 25 Jul 2018 00:40:58 +0000 (17:40 -0700)]
Merge "Enable 2-EV3 packets for Wide Band HFP client"
am:
503067b5f8
Change-Id: Ib1e98cd9888ec9e5ff2da8a8114a6c24d4813cfc
Subramanian Srinivasan [Wed, 25 Jul 2018 00:40:34 +0000 (17:40 -0700)]
Merge "Use appropriate Tx time in BLE Set Data length command"
am:
135c7bc70c
Change-Id: Iafa186226b9ca38f71958de68055fe594bfac557
Joseph Pirozzo [Wed, 25 Jul 2018 00:38:12 +0000 (00:38 +0000)]
Merge "Enable 2-EV3 packets for Wide Band HFP client"
Treehugger Robot [Wed, 25 Jul 2018 00:33:00 +0000 (00:33 +0000)]
Merge "Use appropriate Tx time in BLE Set Data length command"
Fen Wang [Wed, 25 Jul 2018 00:22:28 +0000 (17:22 -0700)]
Make PROPERTY_PRODUCT_MODEL device configurable am:
19e728b9d2
am:
367508d227
Change-Id: I4d3fc8df174c0cd508b305225fb0d41412582df6
Fen Wang [Wed, 25 Jul 2018 00:12:23 +0000 (17:12 -0700)]
Make PROPERTY_PRODUCT_MODEL device configurable
am:
19e728b9d2
Change-Id: I5f25b8a07749e3c3eb7fed3fd4415fac3490c7b5
Bailey Forrest [Wed, 1 Mar 2017 19:27:05 +0000 (11:27 -0800)]
Swap order of registered/status in RegisterForNotificationCallback
It's confusing how the order is inconsistent with the one defined in
hardware/libhardware/include/hardware/bt_gatt_client.h
Test: Build. Right now no code uses these functions.
Change-Id: I04b93ba74555455fd981a3809ea3e0bfffca4696
Subramanian Srinivasan [Thu, 15 Mar 2018 22:58:20 +0000 (15:58 -0700)]
Use appropriate Tx time in BLE Set Data length command
Fixes Tx time parameter in HCI LE set data length command
depending on HCI versions supported by controller.
Bug:
110373079
Change-Id: I83cc4c41ca4c2b6470ec30057717946b1d7fe329
Fen Wang [Tue, 10 Apr 2018 03:41:34 +0000 (12:41 +0900)]
Make PROPERTY_PRODUCT_MODEL device configurable
Make it possible to set PROPERTY_PRODUCT_MODEL in device configuration.
Bug:
Change-Id: I4d34d4ec368f7eb8bd50e2d5431bb120a284f4e3
Cheney Ni [Tue, 24 Jul 2018 04:35:35 +0000 (21:35 -0700)]
Merge "Ignore SDP failure while bonding if SDP was not attempted" am:
62fee1a223
am:
2679201348
Change-Id: Ia6aaf670dc356c33cbb045138fcba8a3d3219872
Cheney Ni [Tue, 24 Jul 2018 04:31:32 +0000 (21:31 -0700)]
Merge "Ignore SDP failure while bonding if SDP was not attempted"
am:
62fee1a223
Change-Id: Iae385d9feca203640c00ab93a8199d3dc3f85fa1
Treehugger Robot [Tue, 24 Jul 2018 04:21:40 +0000 (04:21 +0000)]
Merge "Ignore SDP failure while bonding if SDP was not attempted"
Hansong Zhang [Fri, 20 Jul 2018 18:46:08 +0000 (11:46 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d am:
a9fc38bcbf am:
a7d532c77c
am:
91ff5fdae5
Change-Id: I0916ab399b4f2d7bae1b4dc5c4a505d982ea63c4
Hansong Zhang [Fri, 20 Jul 2018 18:45:00 +0000 (11:45 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4 am:
37e8dd3c55 am:
024d0e1d5b -s ours
am:
58351acf5b
Change-Id: Ia520ddcd0340519e982278e13f6461dcedda673e
Hansong Zhang [Fri, 20 Jul 2018 18:39:40 +0000 (11:39 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d am:
a9fc38bcbf
am:
a7d532c77c
Change-Id: Ic3bbfdf73d39b1455f6d27bf9294fb56011d0829
Hansong Zhang [Fri, 20 Jul 2018 18:39:07 +0000 (11:39 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4 am:
37e8dd3c55
am:
024d0e1d5b -s ours
Change-Id: Idb00a9bfd6c501c90ce4aa4361a586f9cf422f0d
Hansong Zhang [Fri, 20 Jul 2018 18:32:52 +0000 (11:32 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev am:
0d4898a05d
am:
a9fc38bcbf
Change-Id: I70a95eb32638425b21e5bef29a0a02b370277bac
Hansong Zhang [Fri, 20 Jul 2018 18:32:21 +0000 (11:32 -0700)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16 am:
c898c9c6a4
am:
37e8dd3c55
Change-Id: I94485d850eee68f7434b3f8f20332c243ceae2a1
Hansong Zhang [Fri, 20 Jul 2018 18:30:04 +0000 (11:30 -0700)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev
am:
0d4898a05d
Change-Id: Id277c1b6c5b105a492d03980d5cf7e958128b505
Hansong Zhang [Fri, 20 Jul 2018 18:29:19 +0000 (11:29 -0700)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16
am:
c898c9c6a4
Change-Id: If8c3042504c65bb244b253f822409457fadb096e
TreeHugger Robot [Fri, 20 Jul 2018 18:25:33 +0000 (18:25 +0000)]
Merge changes from topic "am-
2c2c464f-fb3a-4c93-8661-
57c986c3e069-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32 skipped:
72d1557fe0
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
DO NOT MERGE SDP: Fix the param_len recalculation
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:45 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32 skipped:
72d1557fe0
Change-Id: Ia2aafdffd87d9f7a00429d50783e64864fe92db3
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:44 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41 am:
f066a42e32
Change-Id: I036429bc438f3713148c44668c9030d9968bbb71
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:43 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce am:
38961f6b41
Change-Id: I2b54ca809d16ca1df0a9061301f76cf64c16243e
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:41 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b am:
d305a203ce
Change-Id: I792c9737e3ba5ac8ab173e7675ddde50383a97b8
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:40 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
51b656f12b
Change-Id: Ic935bcfa40526b5f6dbd8714552b6420a35cf29a
Hansong Zhang [Fri, 20 Jul 2018 17:16:14 +0000 (10:16 -0700)]
DO NOT MERGE SDP: Fix the param_len recalculation
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: If32b848696180ab2fd33f514de89cb8c3d202e39
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:24 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8 skipped:
00dad61a16
Change-Id: I4f5e848e72f9ae77371c2d4e596a882581d8fe7b
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:23 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e am:
d3bb538dc8
Change-Id: I8705f0d81fba1027c7a9b506f447482901227c40
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:22 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4 am:
f74d7ad31e
Change-Id: I53e95354ae4b588f11e57fc6e5aef741177becfe
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:20 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a am:
20558f53c4
Change-Id: I0693e632de44e6781f7435a730dcd485e27e4cab
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:19 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233 am:
5addfc4d9a
Change-Id: I54d6a6295dcb5791aa339ffaa23ac2f319acd667
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:18 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23 skipped:
58417f9233
Change-Id: I5429442640a203df07ba448e8b9837fb8017eb6d
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:17 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb am:
7d92fdbb23
Change-Id: Ie9d7f0209ad248035cb65c9e6d04236ba61a9264
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:15 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e am:
43d4bf00eb
Change-Id: Iea2346e652fe6bb086e894615bb409491d60457d
Android Build Merger (Role) [Fri, 20 Jul 2018 17:17:14 +0000 (17:17 +0000)]
[automerger] DO NOT MERGE SDP: Fix the param_len recalculation am:
7b2d711d9e
Change-Id: I1adfd8dd7cd684e5d9af4a1967f0630e53fe035f
Hansong Zhang [Fri, 20 Jul 2018 17:16:14 +0000 (10:16 -0700)]
DO NOT MERGE SDP: Fix the param_len recalculation
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: If32b848696180ab2fd33f514de89cb8c3d202e39
Xin Li [Fri, 20 Jul 2018 06:48:42 +0000 (23:48 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am:
5c8ebba798
Change-Id: I85a0f9338f373c74bfd08108f3a113488a29ea93
Xin Li [Thu, 19 Jul 2018 20:50:38 +0000 (13:50 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug:
111615259
Change-Id: I380b09793ed30e2577f8ea2783ce2cc46b859278
Hansong Zhang [Wed, 18 Jul 2018 22:36:43 +0000 (15:36 -0700)]
Clean up style in BLE White List code am:
efb54f7d37
am:
879f7060d2
Change-Id: Iaa3e020f7b053b59fb53d92326ca800cd5fdf922
Hansong Zhang [Wed, 18 Jul 2018 22:34:06 +0000 (15:34 -0700)]
Clean up style in BLE White List code
am:
efb54f7d37
Change-Id: Ia4cee8a5437c430dc75fbf16db9cc381ed4f2e1c
Benson Li [Wed, 18 Jul 2018 19:07:18 +0000 (12:07 -0700)]
[automerger skipped] Merge "AVRCP: Reject SetAddressedPlayer command only if remote set invalid player ID" into pi-dev
am:
3ff7033b27 -s ours
Change-Id: I5303a47ddb949dd84d9f6b19d89e924401f3f063
TreeHugger Robot [Wed, 18 Jul 2018 18:58:15 +0000 (18:58 +0000)]
Merge "AVRCP: Reject SetAddressedPlayer command only if remote set invalid player ID" into pi-dev
Hansong Zhang [Tue, 17 Jul 2018 00:57:17 +0000 (17:57 -0700)]
Clean up style in BLE White List code
* Remove unused code
* Update BgConnHash to return size_t for hashcode
* Change BLE scan_int and scan_win to uint16_t according to spec
Bug:
111562702
Test: SL4A BLE test and manual with BLE mouse
Change-Id: Ieff3acbfaa95b7d804e57021d562218d9fbe42cc
Cheney Ni [Tue, 17 Jul 2018 11:27:59 +0000 (19:27 +0800)]
Ignore SDP failure while bonding if SDP was not attempted
When bonding, there is an ACL_UP event to the upper layers and some apps
may want to fetch SDP in return. This can break pairing. In cases SDP fails,
it causes the procedure to be finished before the LinkKey is generated.
And thus the LinkKey is not committed to NVRAM and the device is not paired.
Bug:
111189110
Test: : Pair / Unpair BT accessories manually
Change-Id: Iaefbe8b6c1fc3e78f0f120220992df84699a2eb8
Jack He [Wed, 18 Jul 2018 00:05:21 +0000 (17:05 -0700)]
Merge "Metrics: Add python script to dump metrics into ASCII format" am:
85cce9b01f
am:
ca55025537
Change-Id: I025ffdc3ea9e6ffd2d2f3b110f87fe3291dda036
Jack He [Tue, 17 Jul 2018 23:59:50 +0000 (16:59 -0700)]
Merge "Metrics: Add python script to dump metrics into ASCII format"
am:
85cce9b01f
Change-Id: Ib882d2a6fc9d430cb7d0bf55e0e7c551b7b2d05a
Treehugger Robot [Tue, 17 Jul 2018 23:50:34 +0000 (23:50 +0000)]
Merge "Metrics: Add python script to dump metrics into ASCII format"
Jack He [Fri, 13 Jul 2018 21:54:38 +0000 (14:54 -0700)]
Metrics: Add python script to dump metrics into ASCII format
Test: make,
./dump_metrics_ascii.py proto/bluetooth/metrics/bluetooth.proto
Change-Id: Ie671fa2c2ceb9f93ed62495b592a2cf9d69ff41b