OSDN Git Service
Treehugger Robot [Tue, 29 Sep 2020 01:09:55 +0000 (01:09 +0000)]
Merge "Call EXPECT_CALL before the incoming event" am:
e4bfe75a30 am:
cd9aa2e6c3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440335
Change-Id: I46934f3c297005b19a59e6a52097b6ec50e3379b
Treehugger Robot [Tue, 29 Sep 2020 01:09:49 +0000 (01:09 +0000)]
Merge "SM: Implement name request during Classic pairing" am:
d165f580d1 am:
c89db9cc3f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1427614
Change-Id: I365ccc65919fda56d7e2b2b4cc1464d0166d4b11
Treehugger Robot [Tue, 29 Sep 2020 00:49:45 +0000 (00:49 +0000)]
Merge "Call EXPECT_CALL before the incoming event" am:
e4bfe75a30
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440335
Change-Id: I02ee5fb7f129272f6d3b9679c080f26c0c1d776d
Treehugger Robot [Tue, 29 Sep 2020 00:49:15 +0000 (00:49 +0000)]
Merge "Call EXPECT_CALL before the incoming event"
Treehugger Robot [Tue, 29 Sep 2020 00:48:56 +0000 (00:48 +0000)]
Merge "SM: Implement name request during Classic pairing" am:
d165f580d1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1427614
Change-Id: Iabe7191aa6c49e713210d8b37fe181a41164b8e9
Treehugger Robot [Tue, 29 Sep 2020 00:00:20 +0000 (00:00 +0000)]
Merge "SM: Implement name request during Classic pairing"
Hansong Zhang [Mon, 28 Sep 2020 23:41:05 +0000 (23:41 +0000)]
L2CAP: Remove unused ConnectRsp am:
3dbda905a5 am:
a33066c188
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440333
Change-Id: Ida07bf1545b2ce153908dcc30d39c54be5656467
Hansong Zhang [Mon, 28 Sep 2020 23:19:52 +0000 (23:19 +0000)]
L2CAP: Remove unused ConnectRsp am:
3dbda905a5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440333
Change-Id: I1c1428f21cc3233903e686f9cae3b922e08c8518
Martin Brabham [Mon, 28 Sep 2020 22:52:55 +0000 (15:52 -0700)]
Call EXPECT_CALL before the incoming event
Bug:
169598507
Tag: #stability
Test: atest --host bluetooth_test_gd
Change-Id: If58fa04c6c292c197959b14e29f52800fd14c03b
Hansong Zhang [Mon, 28 Sep 2020 21:47:59 +0000 (21:47 +0000)]
RFCOMM, AVDT, HID: L2cap signal id is not used am:
ade4d449cd am:
9f90030137
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440416
Change-Id: If408df5c24ac53c76b73f7ef2001a17207b1ad58
Hansong Zhang [Mon, 28 Sep 2020 21:42:30 +0000 (21:42 +0000)]
Include initial remote config in pL2CA_ConfigCfm_Cb am:
aec9dadc2e am:
0d9deed5c0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440332
Change-Id: I2cfbc071b90d2fd5d068b3a20afba7560b094df0
Hansong Zhang [Mon, 28 Sep 2020 21:42:17 +0000 (21:42 +0000)]
Serialize L2CAP connect ind/cfm, config ind, cfm am:
b737b6dcda am:
23615d56c8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440691
Change-Id: I35a95dc88c823a66d01e1b4003bae26640ee2e07
Hansong Zhang [Mon, 28 Sep 2020 21:42:16 +0000 (21:42 +0000)]
L2cap: Auto send ConnectRsp am:
d8d7224c2e am:
1b00239503
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440654
Change-Id: I60141e2d1aa5df7d608fccc6701cd754644c21b7
Hansong Zhang [Mon, 28 Sep 2020 21:42:15 +0000 (21:42 +0000)]
Check for control block nullptr on l2cap error am:
d77658a680 am:
7a0ce3e74c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440653
Change-Id: Ib226e9357eb13baa7c971261702856b9cf715c55
Hansong Zhang [Mon, 28 Sep 2020 21:42:14 +0000 (21:42 +0000)]
L2cap channel cb: Store who initiated dynamic channel am:
7bfe49749a am:
d1b11fe61f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440652
Change-Id: I5c59b64189a4e929e474a7c6d13747d3cd527eb6
Hansong Zhang [Mon, 28 Sep 2020 21:42:14 +0000 (21:42 +0000)]
We always send pL2CA_ConfigCfm_Cb with status OK am:
40b23cc4ab am:
1bb6f231ce
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440651
Change-Id: Ib027c448ea97732bec594a8bdd37c8845c9e1b68
Hansong Zhang [Mon, 28 Sep 2020 21:42:12 +0000 (21:42 +0000)]
L2cap shim clean up am:
ee79913590 am:
6ca4f683bd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440315
Change-Id: I4514eb872e52bde4326e7afc03877be8ae9cd944
Hansong Zhang [Mon, 28 Sep 2020 21:42:08 +0000 (21:42 +0000)]
L2CAP_FLUSHABLE_PKT is never used am:
6b63057385 am:
6c7a566cd4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440314
Change-Id: Ib3048441c7adeb7a4ff48cee5881b2359347167c
Hansong Zhang [Mon, 28 Sep 2020 21:42:04 +0000 (21:42 +0000)]
Minor clean up in l2c_api am:
324f7e9cec am:
adc9e08a37
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440313
Change-Id: I36cf6452ba6324ba18fffa2d26f63ecfa10a38e9
Hansong Zhang [Mon, 28 Sep 2020 21:42:01 +0000 (21:42 +0000)]
L2cap: Simplify DisconnectRsp am:
014930dadc am:
fe33b32020
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440312
Change-Id: Ib2672bb56d2793da4473f7b104f82605d7f7979f
Hansong Zhang [Mon, 28 Sep 2020 21:41:52 +0000 (21:41 +0000)]
RFCOMM, AVDT, HID: L2cap signal id is not used am:
ade4d449cd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440416
Change-Id: I4399b307c9f1bcc565319eba09b60a9a49133bf2
Hansong Zhang [Mon, 28 Sep 2020 21:41:32 +0000 (21:41 +0000)]
Remove unused L2cap code am:
2d291bead0 am:
f56c1b1e0a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440311
Change-Id: I7c17ef1a11a3e0b6ac8f98bccfbba91b7f892648
Hansong Zhang [Mon, 28 Sep 2020 21:41:30 +0000 (21:41 +0000)]
Simplify avdt_sec_check_complete_term am:
1d6fa5e136 am:
41cb6069c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439087
Change-Id: I3a2c972f6d2103003156efef3df8035d9658451d
Hansong Zhang [Mon, 28 Sep 2020 21:41:27 +0000 (21:41 +0000)]
Simplify bnep_sec_check_complete am:
86fbde4a5e am:
e96b0443a4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439086
Change-Id: I87d9fd1e93064f2b4c0a9f2cd3387a38698c8146
Hansong Zhang [Mon, 28 Sep 2020 21:28:57 +0000 (21:28 +0000)]
Include initial remote config in pL2CA_ConfigCfm_Cb am:
aec9dadc2e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440332
Change-Id: I4d30931e1ce85e2593d04ef2fdae81bae5952cfd
Martin Brabham [Fri, 4 Sep 2020 05:03:32 +0000 (22:03 -0700)]
SM: Implement name request during Classic pairing
Ensure we try to receive the name and wait for it before
we show the UserConfirmation Dialog.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I6a4401873770f7f642e06da34002dba55e5f049e
Hansong Zhang [Mon, 28 Sep 2020 20:55:14 +0000 (20:55 +0000)]
Serialize L2CAP connect ind/cfm, config ind, cfm am:
b737b6dcda
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440691
Change-Id: I20205d2b00a0576eb2413dce747356262db40bf2
Hansong Zhang [Mon, 28 Sep 2020 20:55:12 +0000 (20:55 +0000)]
L2cap: Auto send ConnectRsp am:
d8d7224c2e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440654
Change-Id: I260ba6995b80b8f1ffc8bfee879c9b27d3320b04
Hansong Zhang [Mon, 28 Sep 2020 20:55:08 +0000 (20:55 +0000)]
Check for control block nullptr on l2cap error am:
d77658a680
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440653
Change-Id: I3c574634a60a0a4f376b8670330a848045689efb
Hansong Zhang [Mon, 28 Sep 2020 20:55:05 +0000 (20:55 +0000)]
L2cap channel cb: Store who initiated dynamic channel am:
7bfe49749a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440652
Change-Id: I3c642a89b7ca5c38fad8ed3905f224a32c67a738
Hansong Zhang [Mon, 28 Sep 2020 20:55:02 +0000 (20:55 +0000)]
We always send pL2CA_ConfigCfm_Cb with status OK am:
40b23cc4ab
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440651
Change-Id: I21c840a6db17549af0a378cf5af3f57c91facd93
Hansong Zhang [Mon, 28 Sep 2020 20:54:58 +0000 (20:54 +0000)]
L2cap shim clean up am:
ee79913590
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440315
Change-Id: I4158575f6fc937f5c061aad1e9bf14b72381c274
Hansong Zhang [Mon, 28 Sep 2020 20:54:55 +0000 (20:54 +0000)]
L2CAP_FLUSHABLE_PKT is never used am:
6b63057385
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440314
Change-Id: Ie5273670372d83b30ff1f6cf3406843496d917d7
Hansong Zhang [Mon, 28 Sep 2020 20:54:51 +0000 (20:54 +0000)]
Minor clean up in l2c_api am:
324f7e9cec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440313
Change-Id: I436a7ffeabe9c926062f05831aea7056396b1158
Hansong Zhang [Mon, 28 Sep 2020 20:54:48 +0000 (20:54 +0000)]
L2cap: Simplify DisconnectRsp am:
014930dadc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440312
Change-Id: Iefab338e11f2815cce8e352d679f2e410cae93a0
Hansong Zhang [Mon, 28 Sep 2020 20:54:29 +0000 (20:54 +0000)]
Remove unused L2cap code am:
2d291bead0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1440311
Change-Id: Ie3beca412e99a47bfe4d2d07452ed1d98388d0ef
Hansong Zhang [Mon, 28 Sep 2020 20:54:24 +0000 (20:54 +0000)]
Simplify avdt_sec_check_complete_term am:
1d6fa5e136
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439087
Change-Id: Ie361553e46e0bf5c56503b0a1153d9791bba476f
Hansong Zhang [Mon, 28 Sep 2020 20:53:44 +0000 (20:53 +0000)]
Simplify bnep_sec_check_complete am:
86fbde4a5e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439086
Change-Id: Idb4a0b924b656e23556d6161da055fe6a8de2398
Hansong Zhang [Mon, 28 Sep 2020 20:00:18 +0000 (13:00 -0700)]
L2CAP: Remove unused ConnectRsp
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifa6fc5470aeda670eb51482ed91a2b7ab665a813
Hansong Zhang [Mon, 28 Sep 2020 19:55:17 +0000 (19:55 +0000)]
l2c_csm: Use pL2CA_Error_Cb on error am:
30a07c56e1 am:
7f4a3dac18
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439085
Change-Id: Ib1984734eda6f9ce33fcbefce71d59ffc68d34b0
Hansong Zhang [Mon, 28 Sep 2020 19:55:15 +0000 (19:55 +0000)]
Regard L2CAP_CFG_PENDING as failure am:
5b85860bd5 am:
eb9cc47787
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439084
Change-Id: I9aca2ee3eaa75ae8e5b855cf1c4ccadc2e9202bb
Hansong Zhang [Mon, 28 Sep 2020 19:40:00 +0000 (12:40 -0700)]
RFCOMM, AVDT, HID: L2cap signal id is not used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I53b2236b8603b4d8a3c6a49f8ae1355020a657e5
Hansong Zhang [Mon, 28 Sep 2020 19:20:19 +0000 (12:20 -0700)]
Include initial remote config in pL2CA_ConfigCfm_Cb
So we don't need to send a separate pL2CA_ConfigInd_Cb.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I75dafa4bc38a1c5a7773db6be5665b30ad88b006
Hansong Zhang [Mon, 28 Sep 2020 19:03:43 +0000 (19:03 +0000)]
l2c_csm: Use pL2CA_Error_Cb on error am:
30a07c56e1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439085
Change-Id: I5d53012f81c0ee4358948654418600b897f1f34b
Hansong Zhang [Mon, 28 Sep 2020 19:02:50 +0000 (19:02 +0000)]
Regard L2CAP_CFG_PENDING as failure am:
5b85860bd5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439084
Change-Id: I9d42ccf85dc915acb2561a63d2718bbb1d5c08bf
Hansong Zhang [Mon, 28 Sep 2020 06:59:00 +0000 (23:59 -0700)]
Serialize L2CAP connect ind/cfm, config ind, cfm
Make them happen at one place.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie6b073312f77d837009783dcdbbf6835dfe71985
Hansong Zhang [Sun, 27 Sep 2020 23:49:17 +0000 (16:49 -0700)]
L2cap: Auto send ConnectRsp
In the past, L2cap user can decide whether to accept or reject a
ConnectReq. If reject, the channel is closed.
Now let L2cap layer always auto accept the remote ConnectReq and start
config process. If the L2cap user wants to reject, they can send a
DisconnectReq. According to L2cap state machine, a DisconnectReq after
ConnectRsp terminates the channel, which is equivalent to sending a
negative ConnectRsp, as before.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibed56206148922356e8d9cb10650e9d82ab61225
Hansong Zhang [Sun, 27 Sep 2020 23:30:03 +0000 (16:30 -0700)]
Check for control block nullptr on l2cap error
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie041822b2f51aa20e57fa35f90c432a6c96733d5
Hansong Zhang [Sun, 27 Sep 2020 23:12:43 +0000 (16:12 -0700)]
L2cap channel cb: Store who initiated dynamic channel
Use pL2CA_ConfigCfm_Cb to let user know the direction.
Later the user can run check in ConnectInd or ConnectCfm callback.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iae663e6bea0fc9426c5dfbbfc52bd1ae848f2965
Hansong Zhang [Sun, 27 Sep 2020 22:53:12 +0000 (15:53 -0700)]
We always send pL2CA_ConfigCfm_Cb with status OK
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4865330b4c48fe507bd6df72a5e362a616744ef4
Hansong Zhang [Sun, 27 Sep 2020 22:18:57 +0000 (15:18 -0700)]
L2cap shim clean up
Now we send ConfigReq and ConfigRsp automatically, we need to send
callbacks automatically.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I34e9a8afef63fed21befeda5c3a66e425d6ffaf8
Hansong Zhang [Sun, 27 Sep 2020 21:23:20 +0000 (14:23 -0700)]
L2CAP_FLUSHABLE_PKT is never used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I21ef421c0fcc0f85ab4497fb4ff47bd83a242673
Hansong Zhang [Mon, 28 Sep 2020 17:09:20 +0000 (17:09 +0000)]
Introduce pL2CA_Error_Cb am:
b6e5a07555 am:
cc102a7286
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439083
Change-Id: Icae7a509d9d3cdd276e8911175c02408ce44dd58
Hansong Zhang [Mon, 28 Sep 2020 17:09:17 +0000 (17:09 +0000)]
l2c_csm: Remove unused variable am:
5020f1c00f am:
1e68d372f3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439082
Change-Id: I471805d4fb858f14122a743102788ec7f19fcd24
Hansong Zhang [Mon, 28 Sep 2020 16:48:11 +0000 (16:48 +0000)]
Introduce pL2CA_Error_Cb am:
b6e5a07555
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439083
Change-Id: I4af7949c994761ee6b3a7b6c2808a8077fafdfc7
Hansong Zhang [Mon, 28 Sep 2020 16:47:19 +0000 (16:47 +0000)]
l2c_csm: Remove unused variable am:
5020f1c00f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439082
Change-Id: I7a4ad9d2b31de4811798dcbb206702be137de7b2
Hansong Zhang [Sun, 27 Sep 2020 07:24:48 +0000 (00:24 -0700)]
Minor clean up in l2c_api
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4e7f7d610dba175c9d0abc3d23038891acf31242
Hansong Zhang [Sun, 27 Sep 2020 07:12:49 +0000 (00:12 -0700)]
L2cap: Simplify DisconnectRsp
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working & OPP
Change-Id: I3c4c18bc6d55fe3aa8acda4db8d72f97781729ec
Hansong Zhang [Sun, 27 Sep 2020 07:03:53 +0000 (00:03 -0700)]
Remove unused L2cap code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working & OPP
Change-Id: I3fce28b929e0d8685656b64725d8d36e37a082b4
Hansong Zhang [Sun, 27 Sep 2020 00:59:51 +0000 (17:59 -0700)]
Simplify avdt_sec_check_complete_term
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iabddefde41cc2f63b306efe0cd4eb7e59116141b
Hansong Zhang [Sun, 27 Sep 2020 00:42:02 +0000 (17:42 -0700)]
Simplify bnep_sec_check_complete
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifc0edea758f4d1e0847f5b00fc49b51b4ad00344
Hansong Zhang [Sat, 26 Sep 2020 23:58:47 +0000 (16:58 -0700)]
l2c_csm: Use pL2CA_Error_Cb on error
Note that we only have two result codes, because the user only needs to
know whether it's during ConnectRsp or ConfigRsp (except for HIDH
retry), which we need further research.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I24aa7bf8487c9b2b69fc455cfdb52a7ec758b90b
Hansong Zhang [Sat, 26 Sep 2020 23:48:40 +0000 (16:48 -0700)]
Regard L2CAP_CFG_PENDING as failure
Since all L2CAP users disconnect if the status is not OK.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I112400c2081be12d038426c1e8ea82229d5b9f4a
Hansong Zhang [Sat, 26 Sep 2020 23:39:28 +0000 (16:39 -0700)]
Introduce pL2CA_Error_Cb
L2CAP notifies users error in ConnectRsp and ConfigRsp through this
callback function (not linked so far). Next step is we send success
through pL2CA_ConnectCfm_Cb and pL2CA_ConfigCfm_Cb.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4456487d36248408fc1c31403d107baef05e3646
Hansong Zhang [Sat, 26 Sep 2020 23:20:31 +0000 (16:20 -0700)]
l2c_csm: Remove unused variable
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie11caa34cc55ed7e4aa6789df4cf08725998c73a
Treehugger Robot [Mon, 28 Sep 2020 03:32:59 +0000 (03:32 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am:
960730c35b am:
c45116e6e5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439973
Change-Id: I969910892c7a24aedbf42e03bca7d9a4f9484844
Treehugger Robot [Mon, 28 Sep 2020 03:01:03 +0000 (03:01 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am:
960730c35b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439973
Change-Id: Ic78e1a205f0e6c32291968257f6e069b1579dfb9
Treehugger Robot [Mon, 28 Sep 2020 02:28:06 +0000 (02:28 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux"
Treehugger Robot [Mon, 28 Sep 2020 00:57:12 +0000 (00:57 +0000)]
Merge "Set apex_available property" am:
9a5637591a am:
f99b45ed3d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432812
Change-Id: Iea0150cbb7c04df34d3f15acbe424c4f15593934
Treehugger Robot [Mon, 28 Sep 2020 00:38:30 +0000 (00:38 +0000)]
Merge "Set apex_available property" am:
9a5637591a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432812
Change-Id: I56e4f7d5776bace6a9bec765aedc4a6f34add49f
Treehugger Robot [Mon, 28 Sep 2020 00:05:12 +0000 (00:05 +0000)]
Merge "Set apex_available property"
Hansong Zhang [Sun, 27 Sep 2020 16:34:17 +0000 (16:34 +0000)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu am:
8308c24d8a am:
3e88869b74
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439081
Change-Id: Ib50039db4ee485c69e51bb8fe7efc42ec6f20135
Hansong Zhang [Sun, 27 Sep 2020 16:11:38 +0000 (16:11 +0000)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu am:
8308c24d8a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439081
Change-Id: I07e1644a16015e7ec5d7876a365a28ecf4eee2de
Hansong Zhang [Sun, 27 Sep 2020 07:50:19 +0000 (07:50 +0000)]
Use hidh_on_l2cap_error for error handling am:
95149a585c am:
2170acaf97
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439959
Change-Id: Ifc98b7f512de9b454ec8b6ab6e920ae79e8ec693
Hansong Zhang [Sun, 27 Sep 2020 07:50:17 +0000 (07:50 +0000)]
Use hidd_on_l2cap_error for error handling am:
407ad73659 am:
39bb8732ce
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439638
Change-Id: Iffa5f30c581db924287123cfb6d477e87a2e32e0
Hansong Zhang [Sun, 27 Sep 2020 07:50:15 +0000 (07:50 +0000)]
HID: Simplify security check code am:
a412f6bbb3 am:
0959d40562
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439965
Change-Id: I912bf5b992b7e4e87104f951984ac3c744362836
Hansong Zhang [Sun, 27 Sep 2020 07:50:13 +0000 (07:50 +0000)]
Use rfc_on_l2cap_error for error handling am:
d3c390b077 am:
ab41398cec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439637
Change-Id: Icf147ed35c5fd9a552655fe90bce777fa5df9b05
Hansong Zhang [Sun, 27 Sep 2020 07:50:11 +0000 (07:50 +0000)]
Use avct_on_l2cap_error for error handling am:
4e82f0d26c am:
45353d3326
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439964
Change-Id: I305f7dec303a1ea359ebea455c93241496307eab
Hansong Zhang [Sun, 27 Sep 2020 07:50:08 +0000 (07:50 +0000)]
Use avdt_on_l2cap_error for error handling am:
ece51101ed am:
c06e9e0a8d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439963
Change-Id: Ic9ad867a8b13b12db4269d8a9a2f0e7e4bac844a
Hansong Zhang [Sun, 27 Sep 2020 07:50:05 +0000 (07:50 +0000)]
Use avct_br_on_l2cap_error am:
4e00fa771a am:
df5d0dee30
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439962
Change-Id: I698d4293782587ccb4a01429ebc1da08a28c47c5
Hansong Zhang [Sun, 27 Sep 2020 07:25:37 +0000 (07:25 +0000)]
Use hidh_on_l2cap_error for error handling am:
95149a585c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439959
Change-Id: I306d906901998af5c5cf41b844e32b16df7a7722
Hansong Zhang [Sun, 27 Sep 2020 07:25:34 +0000 (07:25 +0000)]
Use hidd_on_l2cap_error for error handling am:
407ad73659
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439638
Change-Id: Ice0383502cc4ed8210dd326671a17fbecbf5e154
Hansong Zhang [Sun, 27 Sep 2020 07:25:31 +0000 (07:25 +0000)]
HID: Simplify security check code am:
a412f6bbb3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439965
Change-Id: I6f128e6bd65565bf44ad6e1257c92fb26c692258
Hansong Zhang [Sun, 27 Sep 2020 07:25:28 +0000 (07:25 +0000)]
Use rfc_on_l2cap_error for error handling am:
d3c390b077
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439637
Change-Id: I70c2c8bf6286149d4a09cce25d67fe4a1a311c61
Hansong Zhang [Sun, 27 Sep 2020 07:25:25 +0000 (07:25 +0000)]
Use avct_on_l2cap_error for error handling am:
4e82f0d26c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439964
Change-Id: Id17abbde51854c5b624f6a7527244e4aa11eff01
Hansong Zhang [Sun, 27 Sep 2020 07:25:21 +0000 (07:25 +0000)]
Use avdt_on_l2cap_error for error handling am:
ece51101ed
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439963
Change-Id: I26b046a88658c748960d09e4f3499ad09ae48a37
Hansong Zhang [Sun, 27 Sep 2020 07:24:40 +0000 (07:24 +0000)]
Use avct_br_on_l2cap_error am:
4e00fa771a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439962
Change-Id: Ib7c8310fc78799f021ca72a51576ea13cda577f2
Hansong Zhang [Sun, 27 Sep 2020 06:38:13 +0000 (23:38 -0700)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu
Use the old value, which was removed in
I78c3d65fdaf14addf80607ce5105221e52447a9e.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working & OPP
Change-Id: I90a8f94d16f87df2d4ce8bb0de8130d544affd12
Hansong Zhang [Sat, 26 Sep 2020 06:06:13 +0000 (23:06 -0700)]
Use hidh_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I098743c83c82445618d02c2d8491890d8f765fee
Hansong Zhang [Sat, 26 Sep 2020 06:18:33 +0000 (23:18 -0700)]
Use hidd_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I96bb727b01b8f0114d9f0cba1b8068e9591fae1f
Hansong Zhang [Sat, 26 Sep 2020 06:04:26 +0000 (23:04 -0700)]
HID: Simplify security check code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ief3f87adbe41c1d4c5ea848fcddc3d1a3352166b
Hansong Zhang [Sat, 26 Sep 2020 06:30:27 +0000 (23:30 -0700)]
Use rfc_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I32a6be12ab14a27c9c0502961bf5bd9bdbdff005
Hansong Zhang [Sat, 26 Sep 2020 00:40:04 +0000 (17:40 -0700)]
Use avct_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6e35a51a175b43d9b0dc5bb5be859e2d5ff94fa1
Hansong Zhang [Sat, 26 Sep 2020 00:35:36 +0000 (17:35 -0700)]
Use avdt_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I03f15d69e86d12b53fa4ee7fc711d4dca8a294aa
Hansong Zhang [Sat, 26 Sep 2020 00:12:47 +0000 (17:12 -0700)]
Use avct_br_on_l2cap_error
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I40fb1d61ff9375d0da2e1f4c83d42d5b273699c4
Hansong Zhang [Sun, 27 Sep 2020 00:45:17 +0000 (00:45 +0000)]
Use gap_on_l2cap_error for error handling am:
09f5d7f465 am:
7e70de9892
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439960
Change-Id: If8823ce7c8425b0eae2b286e816f4924a8943d0d
Hansong Zhang [Sun, 27 Sep 2020 00:30:14 +0000 (00:30 +0000)]
Use gap_on_l2cap_error for error handling am:
09f5d7f465
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439960
Change-Id: Ib5e1789effa96f6aafc4398099c917629c4baafe
Hansong Zhang [Sat, 26 Sep 2020 23:13:01 +0000 (23:13 +0000)]
Use gatt_on_l2cap_error for error handling am:
e8dc945f4d am:
1ff9532d2b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439958
Change-Id: I170ddb81f2220ef1ccc2dc0eb2f7b7da9abd5773
Hansong Zhang [Sat, 26 Sep 2020 23:12:58 +0000 (23:12 +0000)]
Simplify bnep_on_l2cap_error am:
3b18048449 am:
4ec67658f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439957
Change-Id: Ide68451b3fbb948d53ba58512c4b0def75652490
Hansong Zhang [Sat, 26 Sep 2020 23:12:56 +0000 (23:12 +0000)]
Use bnep_on_l2cap_error for error handling am:
44b477a8bc am:
cb2dd251df
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439956
Change-Id: If1b91a9fd15b4e1cc7fda5fdcfce16f6ced0eea3