- Aug 19, 2022
-
-
Rahul Sabnis authored
Bug: 237572866 Bug: 195410559 Test: system/gd/cert/run --clean --sl4a OobPairingSl4aTest Test: system/gd/cert/run --clean --sl4a_sl4a OobPairingTest Tag: #refactor Ignore-AOSP-First: Security fix Merged-In: Id1c22953c3921810d708e4aee7a8cfc0c4f97718 Change-Id: Id1c22953c3921810d708e4aee7a8cfc0c4f97718 (cherry picked from commit 66bfae6d) (cherry picked from commit f4aa35ad) Merged-In: Id1c22953c3921810d708e4aee7a8cfc0c4f97718
-
Ted Wang authored
Add check for str_len to prevent potential OOB read in vendor response. Bug: 205570663 Tag: #security Test: net_test_stack:StackAvrcpTest Ignore-AOSP-First: Security Change-Id: Iea2c3e17c2c8cc56468c4456822e1c4c5c15f5bc Merged-Id: Iea2c3e17c2c8cc56468c4456822e1c4c5c15f5bc (cherry picked from commit 62e29ee6) Merged-In: Iea2c3e17c2c8cc56468c4456822e1c4c5c15f5bc
-
Chris Manton authored
This reverts commit 31a662d2. Bug: 235293624 Tag: #refactor Test: manual & atest CtsBluetoothTestCases Reason for revert: Breaks Merged-In: I1a9505fabd581201117ec54f711c4120a092afb7 Merged-In: I60bae5d51b6128489964f7ed32c4f9f2605471a0 Change-Id: I60bae5d51b6128489964f7ed32c4f9f2605471a0 (cherry picked from commit b88a3897) Merged-In: I60bae5d51b6128489964f7ed32c4f9f2605471a0
-
Chris Manton authored
Also add LOG_ERROR for error path Bug: 235552757 Test: gd/cert/run Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: Cherry-pick Merged-In: I5086ad669df914cfbe3f2a0f7c5e3100c6aaee7a Change-Id: I5086ad669df914cfbe3f2a0f7c5e3100c6aaee7a (cherry picked from commit 476f0434) Merged-In: I5086ad669df914cfbe3f2a0f7c5e3100c6aaee7a
-
- Aug 10, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: I8a7208ab7738a679d1877cabc841689a7c0e6599
-
Chienyuan authored
Bug: 239773749 Test: gd/cert/run Tag: #refactor Change-Id: I0ed0187d872c0aca96b58ebb6b152e3a93e1e616 Merged-In: I0ed0187d872c0aca96b58ebb6b152e3a93e1e616 (cherry picked from commit 700b8a771b4a5e6b1208b4c4386e99646cbb9c4a) (cherry picked from commit feaeffbe) Merged-In: I0ed0187d872c0aca96b58ebb6b152e3a93e1e616
-
- Jul 29, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: I8638397353d0c122ef731511ef97967c195e8011
-
Chris Manton authored
Bug: 237600252 Test: gd/cert/run, testplans/1181383 Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: Cherry-pick Merged-In: I3b8dccb23259d9b97cd248dc8adf7423f74ad3a1 Change-Id: I3b8dccb23259d9b97cd248dc8adf7423f74ad3a1 (cherry picked from commit 97412bc3) Merged-In: I3b8dccb23259d9b97cd248dc8adf7423f74ad3a1
-
Chris Manton authored
connection::manager no longer arbitrates filter accept list manipulation Bug: 237600252 Test: gd/cert/run, testplans/1181383 Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: Cherry-pick Merged-In: I2d0d2d64c621d565d1ed985da4b061563029def1 Change-Id: I2d0d2d64c621d565d1ed985da4b061563029def1 (cherry picked from commit 32a931ed) Merged-In: I2d0d2d64c621d565d1ed985da4b061563029def1
-
Chris Manton authored
A direct connection not present in the internal connection manager data structure prevents the address from being removed from the filter accept list. Should that occur, go ahead and try to remove it anyway. Bug: 237353773 Test: gd/cert/run Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Ignore-AOSP-First: cherry-pick Merged-In: I0253b9d66b12bbee3c9994298ba054b47cd035dd Change-Id: I0253b9d66b12bbee3c9994298ba054b47cd035dd (cherry picked from commit 7a4e504e) Merged-In: I0253b9d66b12bbee3c9994298ba054b47cd035dd
-
Rahul Arya authored
This is an extremely partial fix for a mostly-broken feature. For fully-managed devices, this fixes the toggle for the file sharing option, by detecting which Bluetooth package should be used rather than just guessing. However, on work profiles, the file sharing option does not really work anyway, it just infinitely loads. In addition, it is not correctly disabled when Bluetooth stops, so the icon just remains but doesn't do anything. A full fix would add the enable/disable sequence for *work* UserHandles to BluetoothOppManager, so the LAUNCHER_ACTIVITY is properly enabled and disabled. In addition, it would fix the issue described in the linked bug to prevent infinite loading (dedicated bug: b/112625123). Tag: #stability Ignore-AOSP-First: For T? Bug: 237389774 Test: Manual, verifying the *badged* BT file sharing icon appears/disappears as needed Change-Id: I070987bc884947246c372c65691c4866ebd1e7c7 (cherry picked from commit 36362f25) Merged-In: I070987bc884947246c372c65691c4866ebd1e7c7
-
Rahul Arya authored
The sequence of events in the state machine that causes the bug is as follows: - We start a search, and move from the IDLE state to the SEARCH_ACTIVE state. - We initiate a pairing request, that sets pairing_cb.state to BT_BOND_STATE_BONDING. - We cancel the search, returning to the IDLE state. - We then try to start a second search. In BTA_DmSearch, we check if we are bonding, and if so enqueue the request. - But we remain in the IDLE state! So we never dequeue the search request, getting us into the stuck state. This CL fixes the issue by removing the *_QUEUE_* events, making the state machine the single arbiter for whether a request should be executed or queued. In particular, for the above scenario, the SDP request will queue behind the second search request, if it arrives afterwards, *even if* bonding has already begun. This prevents us from getting in a stuck state. I believe that this is safe since we preserve the invariant of only ever have one request going through at a time, but manual testing is needed to be certain. The preservation of this invariant also means that we should not regress b/237352700, though I am unable to test that. Note that this CL is stacked on top of the revert^2s at ag/19019716, so it will exhibit merge conflicts until those CLs are landed. Bug: 230277335 Test: Manual, using the repro steps from the bug thread. Tag: #stability Ignore-AOSP-First: Hotfix for T Change-Id: I74e83964995b10f4bee35bae3182ec482bdedb39 (cherry picked from commit d197ce9a) Merged-In: I74e83964995b10f4bee35bae3182ec482bdedb39
-
- Jul 14, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: Ib5a91249d5ee76592687f7a755148602ed3ff869
-
Bart Sears authored
This reverts commit 448c2830. Reason for revert: b/238847789 Test: Clean revert of CL Change-Id: I30941e8b9344e9dbaacaec5ca2c2046d149ed839 (cherry picked from commit bf9246b0) Merged-In: I30941e8b9344e9dbaacaec5ca2c2046d149ed839
-
- Jul 13, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: Ifac34242b9765a5de9a6f3bc3665cf3d631a7bb0
-
Rahul Sabnis authored
returns the mAddress field of the device instead of null when the identity address is not known. Tag: #feature Bug: 238353063 Test: atest AdapterServiceTest#testAddressConsolidate Ignore-AOSP-First: Change needs to land in TM release Change-Id: I577843c9e2cc279915d0632ff25bde66aa949e94 (cherry picked from commit 448c2830) Merged-In: I577843c9e2cc279915d0632ff25bde66aa949e94
-
- Jul 08, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: Iff4b0f9ffa58788f16fd1689ac68d25affa16b20
-
Etienne Ruffieux authored
Bug: 232351962 Tag: #feature Test: atest CtsBluetoothTests Ignore-AOSP-First: change only in internal Change-Id: I66c0a83554d81f8a6a6956ec0a8a324be6b11033 (cherry picked from commit a82b0872) Merged-In: I66c0a83554d81f8a6a6956ec0a8a324be6b11033
-
- Jul 07, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: I83e1dd57f9d93178bd7b07f51fe9ed914149fd28
-
- Jul 01, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: Iaa37e03cf8073dbb17475c7003491386d580eefc
-
Android Build Coastguard Worker authored
Change-Id: Ia63a5c0e3af5e8d5f01304acb89a133eb646858c
-
xiaowang authored
This reverts commit d94ee6a6. Reason for revert: incorrect email id Test: compile Bug: 236995005 Merged-In: I74b91daf8944da1547049817ae2e9c353bbcc3f2 Change-Id: I74b91daf8944da1547049817ae2e9c353bbcc3f2 (cherry picked from commit f122d1a0) (cherry picked from commit e01b1177) Merged-In: I74b91daf8944da1547049817ae2e9c353bbcc3f2
-
xiaowang authored
This reverts commit b03e1033. Reason for revert: incorrect email id Test: compile Bug: 236995005 Merged-In: I6a1e38df8f904d98d26654489fa765228882f9da Change-Id: I6a1e38df8f904d98d26654489fa765228882f9da (cherry picked from commit a5ff7ee2) (cherry picked from commit b256fc5c) Merged-In: I6a1e38df8f904d98d26654489fa765228882f9da
-
Rahul Sabnis authored
Revert submission 19019716 Reason for revert: b/237352700 Reverted Changes: I8e37ac142:Revert "Queue discovery and device inquiry while b... Ic8642a39f:Revert "Make SDP and inquiry request dequeue and e... I06eb6d806:Revert "Immediately execute instead of queueing re... Bug: 237352700 Test: Manual Change-Id: I56db49540b139ae0d8d1e5819d348d28e432a5e3 (cherry picked from commit bba6b41f) Merged-In: I56db49540b139ae0d8d1e5819d348d28e432a5e3
-
Rahul Sabnis authored
Revert submission 19019716 Reason for revert: b/237352700 Reverted Changes: I8e37ac142:Revert "Queue discovery and device inquiry while b... Ic8642a39f:Revert "Make SDP and inquiry request dequeue and e... I06eb6d806:Revert "Immediately execute instead of queueing re... Bug: 237352700 Test: Manual Change-Id: I52e9d3828cbd785dfb816541cf19e7b7a8f2bff8 (cherry picked from commit 21e82985) Merged-In: I52e9d3828cbd785dfb816541cf19e7b7a8f2bff8
-
Rahul Sabnis authored
3da8e931 Bug: 237352700 Test: Manual Change-Id: I4699b7d73383b8b09ad1e3292d9dc2673f145736 (cherry picked from commit dc8078ab) Merged-In: I4699b7d73383b8b09ad1e3292d9dc2673f145736
-
Sungsoo Lim authored
Bug: 237175319 Tag: #refactor Test: build Change-Id: I7d7ef16387756a53115701c461fa735f214c3f25 (cherry picked from commit aed442ee) (cherry picked from commit b94bfd91) Merged-In: I7d7ef16387756a53115701c461fa735f214c3f25
-
- Jun 30, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: I649056e59cadef49a3509ec045a302c7bc363a85
-
Jack He authored
This reverts commit fa97f8d0. Reason for revert: 60ms is above the maximum recommended initial connection interval, slow down the encryption procedure Test: testplans/1161726 Bug: 233417283 Merged-In: I0c117718f391b9ecf53fb263253eff4b7b59e8f1 Change-Id: I0c117718f391b9ecf53fb263253eff4b7b59e8f1 (cherry picked from commit cbf93504) (cherry picked from commit a312a815) Merged-In: I0c117718f391b9ecf53fb263253eff4b7b59e8f1
-
- Jun 29, 2022
-
-
Android Build Coastguard Worker authored
Change-Id: I67377ee00eae39bd4676731556b42f1c4ffecf20
-
Android Build Coastguard Worker authored
Change-Id: I1b0f0ec8220609517837acf8a68de53aabcfd226
-
Jakub Pawlowski authored
Currently, if we receive notification after disconnection, but before closing the client, stack would notify upper layers that connection is avaliable, and sned notifications to Java. This can be troublesome i.e. for Heart Rate Monitors, that send notifications very often, and can prevent apps from closing properly. Bug: 231818024 Test: connect to HRM with more than one application, close/disconnect multiple times Merged-In: I1e9ca7ba6379322f7321b77a2ea92c96c799a452 Change-Id: I1e9ca7ba6379322f7321b77a2ea92c96c799a452 (cherry picked from commit 666f247f) (cherry picked from commit f65b7a50) Merged-In: I1e9ca7ba6379322f7321b77a2ea92c96c799a452
-
Łukasz Rymanowski authored
This patch fixes regression after https://android-review.googlesource.com/q/topic:gatt-racecondition-fix In case of GATT Write error to descriptor or characteristic, the value which was tried to be written is zeroed in the onWriteDescriptor/Characteristic callback. This cause an issue in following use case: 1) Application writes descriptor on unencrypted link to characteristic which requires authentication 2) Remote device response with an error insufficient authenthication 3) Android repeats write descriptor with new authenthication requrements with the descriptor value taken from the onWriteDescriptor callbac - the one which was zeroed. This result in try to write invalid value to the descriptor This patch make sure that value in the callback is always the one which was tried to write, no matter of status. Bug: 235756799 Test: atest BluetoothInstrumentationTests Tag: #stability Merged-In: Icd18b95a3c44c082117d035cdf25961938de829d Change-Id: Icd18b95a3c44c082117d035cdf25961938de829d (cherry picked from commit 24f45364) (cherry picked from commit b64432cf) Merged-In: Icd18b95a3c44c082117d035cdf25961938de829d
-
Etienne Ruffieux authored
Bug: 217366135 Tag: #feature Test: manual Ignore-AOSP-First: to be chery-picked Change-Id: If8ae530a284151888a3f89a51d2c58f2a5cd3644 (cherry picked from commit 02dcbe72) Merged-In: If8ae530a284151888a3f89a51d2c58f2a5cd3644
-