OSDN Git Service
Jack He [Wed, 22 Aug 2018 08:29:07 +0000 (01:29 -0700)]
Merge "A2DP-SINK: Use MessageLoopThread for decoding" am:
376b8cf273
am:
75d95ba6ba
Change-Id: If3da028e019d4e9910f25b9692471e96f0bce6e7
Jack He [Wed, 22 Aug 2018 01:24:32 +0000 (18:24 -0700)]
Merge "A2DP-SINK: Use MessageLoopThread for decoding"
am:
376b8cf273
Change-Id: I5a76fcc2c44dabcb553fc52acf79f57c3885bce3
Treehugger Robot [Tue, 21 Aug 2018 23:47:01 +0000 (23:47 +0000)]
Merge "A2DP-SINK: Use MessageLoopThread for decoding"
Ted Wang [Tue, 21 Aug 2018 03:59:33 +0000 (20:59 -0700)]
Merge "Fix "Disable Absolute Volume" Bluetooth developer option" am:
4de73dae02
am:
8bdbab4380
Change-Id: Id8c1b39f917acbe949ee433d977ee6dc2c3d4bb1
Ted Wang [Tue, 21 Aug 2018 03:32:28 +0000 (20:32 -0700)]
Merge "Fix "Disable Absolute Volume" Bluetooth developer option"
am:
4de73dae02
Change-Id: I8a1dd33fef1588126748a69ca57ab4e6839cc89a
Ted Wang [Tue, 21 Aug 2018 02:32:49 +0000 (02:32 +0000)]
Merge "Fix "Disable Absolute Volume" Bluetooth developer option"
Jack He [Tue, 21 Aug 2018 02:13:26 +0000 (19:13 -0700)]
Disable CFI verification for stack_rfcomm test that uses gtest+gmock am:
baa8df4f57
am:
e25d36e3ba
Change-Id: If43d7d15b79303be222c86322a2b6593740b73b5
Jack He [Tue, 21 Aug 2018 01:23:24 +0000 (18:23 -0700)]
Disable CFI verification for stack_rfcomm test that uses gtest+gmock
am:
baa8df4f57
Change-Id: Ibc40188504563046a945e0d0840b3b978c2d8f11
Jack He [Mon, 20 Aug 2018 22:46:24 +0000 (15:46 -0700)]
Disable CFI verification for stack_rfcomm test that uses gtest+gmock
Apparently, the CFI verification crashes unit tests that
are using gtest+gmock. Interestingly, those tests succeed for 32-bit
binaries, and fail for 64-bit binaries.
Bug:
71739588
Test: Running the 64-bit version of the unit tests in test/run_unit_tests.sh
Change-Id: Ic950087181a86d08af1b858272e946ef4125b78a
Jack He [Thu, 16 Aug 2018 08:29:50 +0000 (01:29 -0700)]
A2DP-SINK: Use MessageLoopThread for decoding
* Instead of OSI thread, use MessageLoopThread for decoding
* Similar to A2DP source
* Change tBTIF_A2DP_SINK_CB into a proper class BtifA2dpSinkControlBlock
* Initialize variables in BtifA2dpSinkControlBlock's constructor
* Free un-freed variables in BtifA2dpSinkControlBlock::Reset() method
Bug:
110303473
Test: mm -j40, unit test, stream music
Change-Id: I21f5b0c9f88d2cadada6fc854070d31ac378244f
Ted [Fri, 17 Aug 2018 10:49:37 +0000 (18:49 +0800)]
Fix "Disable Absolute Volume" Bluetooth developer option
Do not report device support absolute volume while
"Disable Absolute Volume" in developer option is enabled or
the remote device is listed in the interoperability database.
Test: manually adjust volume when Disable Absolute Volume is enabled
Bug:
112193362
Change-Id: Id63a22dba0d8a871035774fc86b66d32e9225b48
Sunny Kapdi [Mon, 20 Aug 2018 06:05:16 +0000 (23:05 -0700)]
A2DP Offload: Fix Max AVDTP MTU for Offload am:
e42bc5bb99
am:
8bbd39de33
Change-Id: Ic5b3829ffaa6fd8abfba5b555cfa75e52b3e9fea
Sunny Kapdi [Mon, 20 Aug 2018 06:01:28 +0000 (23:01 -0700)]
A2DP Offload: Fix Max AVDTP MTU for Offload
am:
e42bc5bb99
Change-Id: I91c9db05409352fe64f2c47f7b3608959760d0c2
Sunny Kapdi [Thu, 5 Jul 2018 21:31:21 +0000 (14:31 -0700)]
A2DP Offload: Fix Max AVDTP MTU for Offload
Fix the max AVDTP MTU for Offload to what
can fit in a 3DH5 packet after accounting
for AVDTP and L2CAP header.
Also:
- Moved MAX_2MBPS_AVDTP_MTU and MAX_3MBPS_AVDTP_MTU to the common
avdt_api.h so it can be used by the rest of the code
- Removed previously incorrect value of BTA_AV_MAX_A2DP_MTU and
replace it with the new (correct) value of MAX_3MBPS_AVDTP_MTU
- Removed duplicate define of MAX_2MBPS_AVDTP_MTU and use
the one from avdt_api.h
Bug:
78907438
Test: A2DP Streaming
Change-Id: I2c60c34c33e4164c9f7e2e7362bbb600482dec97
Bailey Forrest [Sat, 18 Aug 2018 20:29:10 +0000 (13:29 -0700)]
Merge "Implement A2DP sink and AVRCP controller binder server" am:
bb216d2135
am:
b849a93e8f
Change-Id: Ib35564311cc8b52b2ff186b03d63e000adfb30d6
Bailey Forrest [Sat, 18 Aug 2018 20:25:10 +0000 (13:25 -0700)]
Merge "Implement A2DP sink and AVRCP controller binder server"
am:
bb216d2135
Change-Id: Ic620184565246aa4a3b2f20df4bfcc39f5a3e395
Treehugger Robot [Sat, 18 Aug 2018 20:18:39 +0000 (20:18 +0000)]
Merge "Implement A2DP sink and AVRCP controller binder server"
Bailey Forrest [Tue, 31 Jan 2017 01:38:58 +0000 (17:38 -0800)]
Implement A2DP sink and AVRCP controller binder server
Also added bonded device management because this is needed for A2DP to
work with most devices.
Bug:
32657860
Test: Run on device, modified tests pass.
Change-Id: I862e41b6594b7cec9f61094d300577574cc8bbc6
Jack He [Sat, 18 Aug 2018 02:25:12 +0000 (19:25 -0700)]
Merge "Replace period_ms_t with uint64_t" am:
e0fc57522f
am:
73d409b888
Change-Id: I616678dc196caa8097cafe9ed74a421bbc9431ae
Jack He [Sat, 18 Aug 2018 02:08:11 +0000 (19:08 -0700)]
Merge "Replace period_ms_t with uint64_t"
am:
e0fc57522f
Change-Id: Ia0e930e8efe1a6c14f3073d65eb130b68de48db2
Treehugger Robot [Sat, 18 Aug 2018 00:30:46 +0000 (00:30 +0000)]
Merge "Replace period_ms_t with uint64_t"
Jack He [Thu, 16 Aug 2018 05:17:23 +0000 (22:17 -0700)]
Replace period_ms_t with uint64_t
* There is no need to define a unit for millisecond in our system since
uint64_t is the largest integer that is supported
* period_ms_t results in many unnecessary dependency on
osi/include/time.h
* Used text editor to do the directory wise replacement, basically
sed -i 's/period_ms_t/uint64_t/g' *
* Need to modify several method and variable names to indicate that they
are using millisecond as time unit
Bug:
110303473
Test: build, no functional change as period_ms_t was a typedef of
uint64_t
Change-Id: I497c9a146a97bab7c7477b358847dad958b92034
Hemant Gupta [Fri, 17 Aug 2018 00:44:32 +0000 (17:44 -0700)]
Merge "HID: Remove device from database in error case" am:
8a227452d1
am:
51ac073266
Change-Id: Id0b38e46d26f341e34b5756ac0e6f603b426972b
Ugo Yu [Fri, 17 Aug 2018 00:33:34 +0000 (17:33 -0700)]
Fix wrong UUID mask when doing BLE filter scan
am:
f827e9fc32
Change-Id: I98baeb41a2bdeafe7164a2c756b1931e593e9733
Hemant Gupta [Thu, 16 Aug 2018 23:52:28 +0000 (16:52 -0700)]
Merge "HID: Remove device from database in error case"
am:
8a227452d1
Change-Id: I307b1671a86485b4f17dd254f49cdc91ad96bf34
Treehugger Robot [Thu, 16 Aug 2018 18:27:34 +0000 (18:27 +0000)]
Merge "HID: Remove device from database in error case"
Ugo Yu [Wed, 15 Aug 2018 07:59:17 +0000 (00:59 -0700)]
Merge "Enable SNIFF mode for HFP" am:
156fefcad7
am:
b61c633b2e
Change-Id: Iac9c3a97077831e8df03d46f0da92b24221ae020
Qiyu Hu [Wed, 15 Aug 2018 07:58:36 +0000 (00:58 -0700)]
Merge "Fix reliable write." am:
8f19e1179e
am:
7ce911f7bb
Change-Id: I4380e2b6b2c94d7c1c9469ef06f333ab1c305509
minle.zuo [Wed, 15 Aug 2018 07:51:53 +0000 (00:51 -0700)]
Merge "HFP: Only active BT device can hung up call" am:
340eb06e41
am:
268365ab2b
Change-Id: I2f2e2ceabc68728d6bbf77b4a462b8dd854e641d
Bailey Forrest [Wed, 15 Aug 2018 07:45:12 +0000 (00:45 -0700)]
Merge "Check startup_future before using it" am:
ee0c0d8b0d
am:
ed5509be9e
Change-Id: Iaecc7e7dc1333e4d7d2d7f80e2cf80bb848fffa5
Ugo Yu [Wed, 15 Aug 2018 03:21:36 +0000 (20:21 -0700)]
Merge "Enable SNIFF mode for HFP"
am:
156fefcad7
Change-Id: I8d6dfc2e34d6eccec2738d279d9bbfedff1656df
Qiyu Hu [Wed, 15 Aug 2018 03:21:01 +0000 (20:21 -0700)]
Merge "Fix reliable write."
am:
8f19e1179e
Change-Id: Id51e49f4bbf7029386be917215cf79e03529ddfa
minle.zuo [Wed, 15 Aug 2018 03:16:11 +0000 (20:16 -0700)]
Merge "HFP: Only active BT device can hung up call"
am:
340eb06e41
Change-Id: I6cd4885aaa2dc893f8b8541abf4bac89d8b3af41
Bailey Forrest [Wed, 15 Aug 2018 03:09:55 +0000 (20:09 -0700)]
Merge "Check startup_future before using it"
am:
ee0c0d8b0d
Change-Id: I10282a2c31f19c211e8c0890b7b3a0de005b1ed6
Treehugger Robot [Wed, 15 Aug 2018 02:41:17 +0000 (02:41 +0000)]
Merge "Enable SNIFF mode for HFP"
Treehugger Robot [Wed, 15 Aug 2018 00:11:21 +0000 (00:11 +0000)]
Merge "Fix reliable write."
Treehugger Robot [Tue, 14 Aug 2018 23:27:34 +0000 (23:27 +0000)]
Merge "HFP: Only active BT device can hung up call"
Treehugger Robot [Tue, 14 Aug 2018 23:21:53 +0000 (23:21 +0000)]
Merge "Check startup_future before using it"
Qiyu Hu [Wed, 13 Jun 2018 15:08:17 +0000 (08:08 -0700)]
Fix reliable write.
We cannot simply assume the write is terminated in reliable write. When
the reliable write value is longer than MTU allows, the current
implementation can only send whatever MTU allows and naively set the
status to GATT_SUCCESS, in the name of "application should verify handle
offset and value are matched or not". That's why MTU negotiation is a
workaround as people mention in b/
37031096, which just fits all the write
value into a single request.
This also blocks our test on CtsVerifier.
Bug:
37031096
Test: Manual test and confirm that we don't simply send partial value
Change-Id: I907877608f4672f24c002e630e58bf9133937a5e
Hemant Gupta [Tue, 19 Sep 2017 10:00:56 +0000 (15:30 +0530)]
HID: Remove device from database in error case
Usecase:
1) Pair and connect with remote hid device.
2) Disconnect with remote hid device.
3) Unpair DUT from remote hid device.
4) Send connect request from hid device by pressing any button.
5) Try to pair and connect DUT with remote hid device.
Expected Result
1) Connection should fail after step 4 if remote device does not initaite pairing.
2) Connection should succeed with remote device and hid device should be added to
paired list and hid operations should work properly.
Observed Result
HID operations from remote device starts working without device added to paired list
and UI stucked at pairing.
Root Cause:
After step 4, device should be removed from database when incoming connection is
rejected.
Fix:
Perform virtual unplug for device when connection request for hid is received from
unpaired device.
Test: Issue is not reproducible after stress testing with above change
Bug:
68176469
Change-Id: I9bc72ccc7a849c0d6acf3230a75e1fe95949b3fe
Ugo Yu [Tue, 7 Aug 2018 01:55:11 +0000 (09:55 +0800)]
Enable SNIFF mode for HFP
Bug:
112285337
Test: Manual
Change-Id: Ibb019d11cf93051a198df4efb7bd79f31c15a9c0
minle.zuo [Wed, 25 Jul 2018 09:02:51 +0000 (17:02 +0800)]
HFP: Only active BT device can hung up call
Some inactive devices can't send hung up key to host when
HFP connected and active call exist.
And other inactive devices can send hung up call by
sending hung up command.
Solution: To keep consistency of this behavior,
only allow active BT device to hung up call.
Test: Active device can hung up call and inactive can't hung up
Change-Id: Iec1ae689f1d40c15199707e9e925814f71ded619
Bailey Forrest [Thu, 2 Aug 2018 22:10:46 +0000 (15:10 -0700)]
Check startup_future before using it
event_finish_startup and startup_timer_expired can race, leading one of
them to try to use startup_future when it is NULL.
Check startup_future still exists before using it.
Bug:
112114060
Test: Use Bluetooth
Change-Id: I018d45f070b3f931c1114abf0471b6ea1d524f2a
Xin Li [Tue, 14 Aug 2018 00:44:14 +0000 (17:44 -0700)]
Merge "Merge stage-dr1-aosp-master into stage-aosp-master" into stage-aosp-master
am:
c05810f5b8
Change-Id: I97e61446c75e2f517fd21c7de5a6dd424078c2a1
Xin Li [Mon, 13 Aug 2018 23:42:29 +0000 (23:42 +0000)]
Merge "Merge stage-dr1-aosp-master into stage-aosp-master" into stage-aosp-master
yunhanw [Mon, 13 Aug 2018 22:40:37 +0000 (15:40 -0700)]
Re-enable LE advertising after disconnect, on controllers not supporting advertising when connected am:
dedbd07ba8
am:
ed19ec32d4
Change-Id: I3452d10450abdfceaa511fac9a4df95f0db8ba43
yunhanw [Mon, 13 Aug 2018 22:05:35 +0000 (15:05 -0700)]
Re-enable LE advertising after disconnect, on controllers not supporting advertising when connected
am:
dedbd07ba8
Change-Id: Ibdb35f7beec68db11af02fa992a3a6576056887f
yunhanw [Mon, 13 Aug 2018 18:47:47 +0000 (11:47 -0700)]
Re-enable LE advertising after disconnect, on controllers not supporting advertising when connected
Bug:
112451773
Test: compiled and local device test
Change-Id: Ia39f46b3b9667cba34465e3ff310df85a765c3e1
Xin Li [Mon, 13 Aug 2018 20:01:24 +0000 (13:01 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
Bug:
112535855
Change-Id: Id58d10687225831374a0cb0b350d3711c7569cd4
Ugo Yu [Mon, 13 Aug 2018 07:11:44 +0000 (00:11 -0700)]
Fix wrong UUID mask when doing BLE filter scan am:
0443337239 am:
be2dad6cc0
am:
930536ef9b
Change-Id: I3fa889e11357a662c09c7741ba3824476494c2f6
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
Cheney Ni [Wed, 8 Aug 2018 14:20:08 +0000 (22:20 +0800)]
Checks the SMP length to fix OOB read
Bug:
111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688
(cherry picked from commit
bc74f834741ddcb47de80b3572ce2eb4186c69e5)
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
(cherry picked from commit
04433372392a3c50558cb96f076757472dac2cec)
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
Cheney Ni [Sat, 11 Aug 2018 01:14:38 +0000 (18:14 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am:
816107b1e3 am:
57cde1b147 am:
c019726c62
am:
206134dc65
Change-Id: Ia03547aa0cc9e74189bf400a3e6b2eb9d09bcdf0
Cheney Ni [Sat, 11 Aug 2018 01:14:03 +0000 (18:14 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev am:
1718736f85 -s ours am:
3d14101b52 -s ours am:
02482e1edd -s ours
am:
8e2028efe4 -s ours
Change-Id: I72e3b3a01d8da577973c9f016e8e02689a5d8b30
Cheney Ni [Sat, 11 Aug 2018 00:56:16 +0000 (17:56 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am:
816107b1e3 am:
57cde1b147
am:
c019726c62
Change-Id: Ie0d10696cff7d8da694c96af8b224fe4d9061383
Cheney Ni [Sat, 11 Aug 2018 00:55:49 +0000 (17:55 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev am:
1718736f85 -s ours am:
3d14101b52 -s ours
am:
02482e1edd -s ours
Change-Id: I69d112ec62826799d275e32cf5499083e84d13fe
Cheney Ni [Sat, 11 Aug 2018 00:27:54 +0000 (17:27 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am:
816107b1e3
am:
57cde1b147
Change-Id: I05d1d2af205963afcd1c6bf77c8ca097662e0fc8
Cheney Ni [Sat, 11 Aug 2018 00:27:34 +0000 (17:27 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev am:
1718736f85 -s ours
am:
3d14101b52 -s ours
Change-Id: Iceb020184e799318eb665e19544c1c8012f2b9f9
Cheney Ni [Sat, 11 Aug 2018 00:25:13 +0000 (17:25 -0700)]
[automerger skipped] Merge "Checks the SMP length to fix OOB read" into oc-dev am:
a0f6200e5f am:
a2d1977617 am:
4b3d08fa40 -s ours
am:
0f963125d2 -s ours
Change-Id: I501b3690632c9d046e595bef7abbd16aca042648
Hansong Zhang [Sat, 11 Aug 2018 00:24:26 +0000 (17:24 -0700)]
[automerger skipped] Merge "Checks the SMP length to fix OOB read" into pi-dev
am:
bd5c196e7b -s ours
Change-Id: I718ddea6629c6e475ae743fac8c08f8b8549d259
Cheney Ni [Sat, 11 Aug 2018 00:11:43 +0000 (17:11 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
am:
816107b1e3
Change-Id: Ic37e076a0e89dc449071b6e715c1ba13034b48e8
Cheney Ni [Sat, 11 Aug 2018 00:11:22 +0000 (17:11 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev
am:
1718736f85 -s ours
Change-Id: Id71e8b3945f0d2051c2b642c6ed83c293f5d31fb
Ugo Yu [Fri, 10 Aug 2018 23:44:27 +0000 (16:44 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am:
7390441c63 am:
039526080b am:
9d97021204
am:
8c7e838596
Change-Id: Id79765275059408420fd18b568411366ece0bde5
Pavlin Radoslavov [Fri, 10 Aug 2018 23:43:58 +0000 (16:43 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am:
a33d897e8a am:
d6f875028c am:
91f21014e1
am:
8beb165548
Change-Id: I7319ab2194688293e24ec034d2fb1cb65d54e32f
Ugo Yu [Fri, 10 Aug 2018 23:43:23 +0000 (16:43 -0700)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev am:
ab4b63e6ad am:
23d8fb31be am:
8a49e7f22d
am:
d274f6de38
Change-Id: Iff2bd7a2e8bb05bc25d9b6c2fadaff1b7f53e38f
Ugo Yu [Fri, 10 Aug 2018 23:42:30 +0000 (16:42 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am:
1503110a53 am:
26b6a7cbf4 am:
1b9264d128 -s ours
am:
91860e267a
Change-Id: If0fc53313d38dbe9c9c335744f993552932a5690
Chienyuan [Fri, 10 Aug 2018 23:42:01 +0000 (16:42 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am:
7e52dc116c am:
ccc3cab119 am:
4d0f5bead6
am:
cfbf784ef5
Change-Id: I6d4b6da8393ca3d9d414af1e917b26381467ee05
Pavlin Radoslavov [Fri, 10 Aug 2018 23:41:32 +0000 (16:41 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:
3834cbd1e6 am:
abf4e82057 am:
ff19b6e112
am:
a64a9a4228
Change-Id: I892b79eb8dbe0b5a81e5756540feef0b5d548b4a
Chienyuan [Fri, 10 Aug 2018 23:40:52 +0000 (16:40 -0700)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev am:
ee9315f84c am:
76ad7b5439 am:
cbfe0fff84
am:
7d2f0bb173
Change-Id: I86500fb6038e5b787f76758a2472c9d7c2b24a14
Ugo Yu [Fri, 10 Aug 2018 23:40:12 +0000 (16:40 -0700)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev am:
cb0cdcc7ab am:
7e719a45da am:
52c5bfffba
am:
e21e0225b8
Change-Id: I74b08b4d5b5cb2fffb777565cc18b424bd6f6617
TreeHugger Robot [Fri, 10 Aug 2018 23:29:21 +0000 (23:29 +0000)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
Cheney Ni [Fri, 10 Aug 2018 23:16:31 +0000 (16:16 -0700)]
[automerger skipped] Merge "Checks the SMP length to fix OOB read" into oc-dev am:
a0f6200e5f am:
a2d1977617
am:
4b3d08fa40 -s ours
Change-Id: I28d07e232999bdda412c4263bd23e78aff2c27d5
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228 skipped:
3d75dd009b
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
Cheney Ni [Fri, 10 Aug 2018 23:12:26 +0000 (16:12 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev am:
a0f6200e5f
am:
a2d1977617
Change-Id: I04f3e39f4900203999ee16a30540c16698fa1100
Hansong Zhang [Fri, 10 Aug 2018 22:50:24 +0000 (22:50 +0000)]
Merge "Checks the SMP length to fix OOB read" into pi-dev
Cheney Ni [Wed, 8 Aug 2018 14:20:08 +0000 (22:20 +0800)]
Checks the SMP length to fix OOB read
Bug:
111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688
Cheney Ni [Fri, 10 Aug 2018 22:36:13 +0000 (15:36 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev
am:
a0f6200e5f
Change-Id: I878e9a56d3a8f6044fe1922711a50e09861eae08
TreeHugger Robot [Fri, 10 Aug 2018 22:20:14 +0000 (22:20 +0000)]
Merge "Checks the SMP length to fix OOB read" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 22:13:33 +0000 (15:13 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am:
7390441c63 am:
039526080b
am:
9d97021204
Change-Id: I44ebb7389fa0c4603991b0e7f6aff8ed114556e9
Pavlin Radoslavov [Fri, 10 Aug 2018 22:13:08 +0000 (15:13 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am:
a33d897e8a am:
d6f875028c
am:
91f21014e1
Change-Id: If813c8360bc6f7d3e9320f4b700ea1fc41eafb3b
Ugo Yu [Fri, 10 Aug 2018 22:12:41 +0000 (15:12 -0700)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev am:
ab4b63e6ad am:
23d8fb31be
am:
8a49e7f22d
Change-Id: I2e94fdce6511d63f26ad680361b74bdd3a6c5ec0
Ugo Yu [Fri, 10 Aug 2018 22:11:58 +0000 (15:11 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am:
1503110a53 am:
26b6a7cbf4
am:
1b9264d128 -s ours
Change-Id: I7d24941f1309ddc65e60fbc84e6354e414185ba6
Chienyuan [Fri, 10 Aug 2018 22:11:43 +0000 (15:11 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am:
7e52dc116c am:
ccc3cab119
am:
4d0f5bead6
Change-Id: Ifa7a555b5a5cf8b016c7e92a832a55429e435584
Pavlin Radoslavov [Fri, 10 Aug 2018 22:11:18 +0000 (15:11 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:
3834cbd1e6 am:
abf4e82057
am:
ff19b6e112
Change-Id: I35f75a3cf59ab1bae7921241eb7825305c4ccc6e
Chienyuan [Fri, 10 Aug 2018 22:10:39 +0000 (15:10 -0700)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev am:
ee9315f84c am:
76ad7b5439
am:
cbfe0fff84
Change-Id: I49d299a85b3e3a00f58dadd3f8af169eab0ca7e4
Ugo Yu [Fri, 10 Aug 2018 22:10:06 +0000 (15:10 -0700)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev am:
cb0cdcc7ab am:
7e719a45da
am:
52c5bfffba
Change-Id: I5b6d62d23ab555cc25a44ad302da5045247a1662
Ugo Yu [Fri, 10 Aug 2018 21:47:15 +0000 (14:47 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am:
7390441c63
am:
039526080b
Change-Id: I42e6c4c2599151607b089452cc2e25d6e5103d47
Pavlin Radoslavov [Fri, 10 Aug 2018 21:46:46 +0000 (14:46 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am:
a33d897e8a
am:
d6f875028c
Change-Id: Ic28bad0cc518cf908765980c361454c2eeb4fa6d
Ugo Yu [Fri, 10 Aug 2018 21:46:09 +0000 (14:46 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev
am:
7390441c63
Change-Id: I273c233acac3bca1b37c937f8cf65b004048b451
Pavlin Radoslavov [Fri, 10 Aug 2018 21:45:45 +0000 (14:45 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev
am:
a33d897e8a
Change-Id: If510886dfb48fe6c741ae6766bcb97d8fa3e482e
TreeHugger Robot [Fri, 10 Aug 2018 21:27:38 +0000 (21:27 +0000)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 21:15:56 +0000 (14:15 -0700)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev am:
ab4b63e6ad
am:
23d8fb31be
Change-Id: I57612c50ca73f7bb4a1192c66976af3053eb78b7
Ugo Yu [Fri, 10 Aug 2018 21:15:28 +0000 (14:15 -0700)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am:
1503110a53
am:
26b6a7cbf4
Change-Id: I0b56adc51b64cb6c56d531a4357066c43c87d09d
Chienyuan [Fri, 10 Aug 2018 21:15:07 +0000 (14:15 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am:
7e52dc116c
am:
ccc3cab119
Change-Id: Ied0904860f58347e9cc5cf96ab486c0fce75443d
Pavlin Radoslavov [Fri, 10 Aug 2018 21:14:46 +0000 (14:14 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:
3834cbd1e6
am:
abf4e82057
Change-Id: I7126caabc99fc2767c63593e938a3510fa6ed187
Chienyuan [Fri, 10 Aug 2018 21:14:13 +0000 (14:14 -0700)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev am:
ee9315f84c
am:
76ad7b5439
Change-Id: Ia183f05e8f3601b9969f7de86033dbd39b974495
Ugo Yu [Fri, 10 Aug 2018 21:13:35 +0000 (14:13 -0700)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev am:
cb0cdcc7ab
am:
7e719a45da
Change-Id: Ibfba8a0de4b8eb7ba7905724b742ea1ced2770a5