aboutsummaryrefslogtreecommitdiff
path: root/android
Commit message (Collapse)AuthorAgeFilesLines
* Reset permissions for not bonded deviceBrian Delwiche2025-02-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | According to the PBAP specification, The PSE user shall have to confirm at least the first Phone Book Access Profile connection from each new PCE. According to the MAP specification, The MCE and MSE shall be bonded before setting up a Message Access Profile connection. Let's remove the permissions when the device is unbonded. This is a backport of change ag/30386015 but requires minor changes to logic. Flag: EXEMPT, security fix Bug: 289375038 Bug: 289811388 Test: atest BluetoothInstrumentationTests Ignore-AOSP-First: security fix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8507ce69bb6e4e508a82cfc41dce56be1450a62e) Merged-In: I8b9b29310db2d14e5dfaddc81a682366fbef42d3 Change-Id: I8b9b29310db2d14e5dfaddc81a682366fbef42d3
* RESTRICT AUTOMERGE backport "opp: validate that content uri belongs to ↵Billy Huang2025-02-211-0/+15
| | | | | | | | | | | | | | | current user" Bug: 296915500 Flag: EXEMPT trivial fix with complete testing coverage Test: atest GoogleBluetoothInstrumentationTests:BluetoothOppSendFileInfoTest Ignore-AOSP-First: fix for undisclosed vulnerability (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5bcfd347823f1d3893d843db2286f2013923fad8) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2e609af40232d899621465e5cd7eeb670476240) Merged-In: Ibff36089bfde4b5bb28d797aeae1423b668943a2 Change-Id: Ibff36089bfde4b5bb28d797aeae1423b668943a2 Change-Id: Ia60fee2666c45180a97e1a17e6f73f3c67f12856
* RESTRICT AUTOMERGE Disallow unexpected incoming HID connectionsHimanshu Rawat2024-11-152-5/+10
| | | | | | | | | | | | | | | | | | | | HID profile accepted any new incoming HID connection. Even when the connection policy disabled HID connection, remote devices could initiate HID connection. This change ensures that incoming HID connection are accepted only if application was interested in that HID connection. This vulnerarbility no longer exists on the main because of feature request b/324093729. Test: mmm packages/modules/Bluetooth Test: Manual | Pair and connect a HID device, disable HID connection from Bluetooth device setting, attempt to connect from the HID device. Bug: 308429049 Ignore-AOSP-First: security (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:03dca3305311096f157da3ab9cfed5cc30f2c135) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:431ef0346302dec8fa8c7d89c4696931e2bbac9a) Merged-In: I013d0528fb18ee87195fb3c8aab553c6a8da5ae4 Change-Id: I013d0528fb18ee87195fb3c8aab553c6a8da5ae4
* Fix permission bypasses to multiple methodsBrian Delwiche2024-08-271-16/+16
| | | | | | | | | | | | | | | | | | | | Researcher reports that some BT calls across Binder are validating only BT's own permissions and not the calling app's permissions. On investigation this seems to be due to a missing null check in several BT permissions checks, which allows a malicious app to pass in a null AttributionSource and therefore produce a stub AttributionSource chain which does not properly check for the caller's permissions. Add null checks. Bug: 242996380 Test: atest UtilsTest Test: researcher POC Tag: #security Ignore-AOSP-First: Security (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed63d97fd6537f539fdde1413bff86a30f80a7b5) Merged-In: I7a11e11257b85dc0752396490abfc79b1c383204 Change-Id: I7a11e11257b85dc0752396490abfc79b1c383204
* Fix jni crash when get field of adTypeweidengke2024-03-121-1/+1
| | | | | | | | The type of field 'ad_type' in com.android.bluetooth.gatt.ScanFilterQueue.Entry is int. Test: Use eng version to verity. Change-Id: Ieee0496d790ab14d86439fdadc330540bedd3ebc Signed-off-by: weidengke <weidengke@xiaomi.com>
* Fix UAF in ~CallbackEnvBrian Delwiche2023-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | com_android_bluetooth_btservice_AdapterService does not null its local JNI environment variable after detaching the thread (which frees the environment context), allowing UAF under certain conditions. Null the variable in this case. Testing here was done through a custom unit test; see patchsets 4-6 for contents. However, unit testing of the JNI layer is problematic in production, so that part of the patch is omitted for final merge. Bug: 291500341 Test: atest bluetooth_test_gd_unit, atest net_test_stack_btm Tag: #security Ignore-AOSP-First: Security (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7a5c71c32d382c0e14083f0d093ae4f5420968ff) Merged-In: I3e5e3c51412640aa19f0981caaa809313d6ad030 Change-Id: I3e5e3c51412640aa19f0981caaa809313d6ad030
* Merge tag 'android-13.0.0_r52' of ↵George Zacharia2023-07-02110-716/+9958
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/modules/Bluetooth into t13.0 Android 13.0.0 Release 52 (TQ3A.230605.012) Change-Id: I379845946815b7c623f83a1d33036ae615f090fb
| * disable AT+ANDROID processing for wearYuyang Huang2023-05-062-2/+1
| | | | | | | | | | | | | | | | | | Test: manual Bug: 275668166 (cherry picked from https://android-review.googlesource.com/q/commit:86461f427e8f13b08e89a31c6a707db48b9456b4) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c487f626c019eed26f9f99653e055773a9653526) Merged-In: Ifd2893abedcb181e67c1de8d6d6a8dfa38381696 Change-Id: Ifd2893abedcb181e67c1de8d6d6a8dfa38381696
| * Merge "Revert "OPP: Do not trimDatabase if ContentProvider doesn't exist"" ↵Ömer Faruk Yılmaz2023-04-051-5/+0
| |\ | | | | | | | | | into tm-qpr-dev
| | * Revert "OPP: Do not trimDatabase if ContentProvider doesn't exist"Ömer Faruk Yılmaz2023-04-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit I215dcc477cdda567feeed9d0d9c39c0a45f1b940 This commit was accidentally added in ag/21002020 and missed in the revert ag/21690645. Hence, reverting it here. Ignore-AOSP-First: Does not need to be removed from AOSP Test: atest BluetoothOppServiceTest Reason for revert: b/266459454 Change-Id: I5b9e2f8dcd32b902ebd242bfafe115a58e1789a4
| * | Merge "Revert "Fix a test in BluetoothOppLauncherActivityTest"" into tm-qpr-devÖmer Faruk Yılmaz2023-04-052-4/+17
| |\ \ | | |/ | |/|
| | * Revert "Fix a test in BluetoothOppLauncherActivityTest"Ömer Faruk Yılmaz2023-03-292-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e8c6a13a1a843979405131c980197bed04344486. Reason for revert: b/266459454 (cherry picked from https://android-review.googlesource.com/q/commit:aa2182ef71e1415a3b5fdffbe2b513e6052f1f97) Merged-In: Ib9ff8d58fae447cb8f29bfa3fd7de7c2eb9c15b7 Change-Id: Ib9ff8d58fae447cb8f29bfa3fd7de7c2eb9c15b7
| * | Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devBill Yi2023-04-021-2/+2
| |\ \
| | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2023-03-311-2/+2
| | |/ | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I8b62d67e327fc7ac6e98c481c161a21fccb44fc2
| * | Merge "BluetoothMetrics: Upload readable sha256, instead of bytes" into ↵Thomas Girardier2023-04-012-6/+9
| |\ \ | | |/ | |/| | | | tm-qpr-dev
| | * BluetoothMetrics: Upload readable sha256, instead of bytesChen Chen2023-03-232-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 264937355 Test: atest BluetoothInstrumentationTests (cherry picked from https://android-review.googlesource.com/q/commit:c5a164cfbf2771d49ccfa2a501fd8e6fcc490745) Merged-In: Ica31ffcc22d5a75aa82b9e2f91b9239d63506a40 Change-Id: Ica31ffcc22d5a75aa82b9e2f91b9239d63506a40
| * | BluetoothMetrics: Add fallback solution for device namesChen Chen2023-03-231-5/+17
| |/ | | | | | | | | | | | | | | Bug: 264937355 Test: atest BluetoothInstrumentationTests (cherry picked from https://android-review.googlesource.com/q/commit:41d98ac1632528f4a4aa240748773780e5236085) Merged-In: If7d8aa463decc99cf95437d7a608ed2612323560 Change-Id: If7d8aa463decc99cf95437d7a608ed2612323560
| * Merge "LE Audio: close GATT server properly" into tm-qpr-devJack He2023-03-231-2/+8
| |\
| | * LE Audio: close GATT server properlyJakub Pawlowski2023-03-211-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are leaking GMCS instance every time BT is restarted. Bug: 273361967 Test: manual, restart bluetooth, observe output of: adb shell dumpsys bluetooth_manager | grep -A 10 "Server\:" (cherry picked from https://android-review.googlesource.com/q/commit:db6561f3d907c74055fe74f8e8a5b979da5cd1aa) Merged-In: I3fabbe267a380a1eae482bb54be5551db9f0029e Change-Id: I3fabbe267a380a1eae482bb54be5551db9f0029e
| * | Merge "Fix that hearing aid paring dialog pops up twice" into tm-qpr-devSungsoo Lim2023-03-211-6/+0
| |\ \ | | |/ | |/|
| | * Fix that hearing aid paring dialog pops up twiceHyundo Moon2023-02-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 263060879 Test: Manually tested the paring with hearing aid Change-Id: If6bb5ddd82c45db678767b359ea8f66da4cc4704 (cherry picked from commit 0f4ad1ebe86517700155e299678f56012927f8e5) Merged-In: If6bb5ddd82c45db678767b359ea8f66da4cc4704
| * | Merge "BluetoothMetrics: Send peripheral device hash through metrics API" ↵Thomas Girardier2023-03-213-46/+51
| |\ \ | | | | | | | | | | | | into tm-qpr-dev
| | * | BluetoothMetrics: Send peripheral device hash through metrics APIChen Chen2023-03-073-46/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 264937355 Test: atest BluetoothInstrumentationTests Change-Id: Ic70a4e6666a7604dc7f59bf4e02dfe16aa50352a (cherry picked from commit on android-review.googlesource.com host: 59abafefe8a0c6e2e611084943f940da8d3b0711) Merged-In: Ic70a4e6666a7604dc7f59bf4e02dfe16aa50352a
| * | | SAP: Catch SecurityException creating SocketMyles Watson2023-03-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the example of OBEX to not crash when switching users. Bug: 234340159 Test: switch users rapidly (cherry picked from https://android-review.googlesource.com/q/commit:8ec31c7732b93f40b89a8977d692c1b8eec21e8e) Merged-In: I3e67f14cc9a95097941c51705ed54957b0f1448f Change-Id: I3e67f14cc9a95097941c51705ed54957b0f1448f
| * | | Merge "Revert "Add test & fix bug for BluetoothOppServiceTest"" into tm-qpr-devTreeHugger Robot2023-03-134-134/+24
| |\ \ \
| | * | | Revert "Add test & fix bug for BluetoothOppServiceTest"Ömer Faruk Yılmaz2023-03-104-134/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7bd6f7bd78b6835ba6c4a7609ee75cfffc9e1c33. Additionally, reverts commit I43c8edd95608103ab04bb0a33965c2ba90971459 and Ia1765bbd024e86a8482f15a93234933edd32024a Test: atest BluetoothOppServiceTest Bug: 266459454 Reason for revert: b/266459454 Change-Id: I6b6d6a3701959331327984964f6267f6c9f8e3c2 Merged-In: I6b6d6a3701959331327984964f6267f6c9f8e3c2
| * | | | Merge "Don't send MAP SMS/MMS messages older than one year" into tm-qpr-devDavid Duarte2023-03-113-12/+102
| |\ \ \ \
| | * | | | Don't send MAP SMS/MMS messages older than one yearChristine Hallstrom2023-03-013-12/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SMS or MMS message is greater than one year old, skip sending the message event. Switch Mms.DATE field to milliseconds since it is stored by telephony in seconds: https://source.corp.google.com/tm-dev/packages/services/Mms/src/com/android/mms/service/MmsService.java;l=810?q=mms.date%20seconds Bug: 196731316 Bug: 264913373 Test: QA, manual send and receive SMS and MMS messages on carkit Change-Id: I811089b5546e4b2c51399b2e94cf7aa75377fb2e (cherry picked from commit aae20216ae61b306813cb4be62644f7d5350f21c)
| * | | | | Merge "BluetoothMetrics: Extract popular device names using Bloomfilter and ↵David Duarte2023-03-114-0/+499
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | hash" into tm-qpr-dev
| | * | | | BluetoothMetrics: Extract popular device names using Bloomfilter and hashChen Chen2023-03-074-0/+499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 264937355 Test: atest BluetoothInstrumentationTests Change-Id: I0b9982eac34c1005904d7edb54f04ef0c16d35d8 (cherry picked from commit on android-review.googlesource.com host: d8d4a78801e6fed30306bb8b297086cefd63f32d) Merged-In: I0b9982eac34c1005904d7edb54f04ef0c16d35d8
| * | | | | Map: Check AdapterService before stopJosh Wu2023-03-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 270114092 Test: atest BluetoothInstrumentationTests Change-Id: Idcc45516b8ad1ad0a2b47f9171a7192bf013cdd4 (cherry picked from https://android-review.googlesource.com/q/commit:4f6a3a832324331ed72b059392f8b290657f77c2) Merged-In: Idcc45516b8ad1ad0a2b47f9171a7192bf013cdd4 Bug: 263323082
| * | | | | Merge "Fix address consolidation when creating sockets" into tm-qpr-devTreeHugger Robot2023-03-081-7/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix address consolidation when creating socketsRahul Arya2023-02-161-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on patch provided by Samsung in b/262644199. Bug: 262644199 Test: manual Change-Id: I66f6c8d783a06d88a370e1fe17df3c4704eae76a (cherry picked from commit 05138246636d2477cc4510e206f44c7be5d208da) Merged-In: I66f6c8d783a06d88a370e1fe17df3c4704eae76a
| * | | | | BluetoothMetrics: Status field to upload for GATT connectionahujapalash2023-03-032-9/+11
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: m statsd_testdrive Change-Id: Ic8ac2788c8772562b9bd6dfd7ac13f0f8ace6b2a PDD: https://eldar.corp.google.com/assessments/150656741 MDR: https://eldar.corp.google.com/assessments/152668825 Bug: 251543813 (cherry picked from commit on googleplex-android-review.googlesource.com host: 373cdbc4b0877cb801caa80526e3aa79c3d29c53) Merged-In: Ic8ac2788c8772562b9bd6dfd7ac13f0f8ace6b2a
| * | | | Fix MapClientContentTest testWilliam Escande2023-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of aosp/2435777 to fix the test Test: atest BluetoothInstrumentationTests Bug: 263323082 Bug: 267298837 Change-Id: I3fea4d809c898d1cce7c1c3e5ce4842da565c747 (cherry picked from commit 88a24ff0d70d3ab86a4048ef34e634af75b1b36f) Merged-In: I3fea4d809c898d1cce7c1c3e5ce4842da565c747
| * | | | Fix Null Pointer crashIdriss Juhoor2023-03-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing null pointer crash in MapClientContent. This happens when the watch starts the MapClientController and doesn't have a telephony subscription. aosp/2129638 already fix this but didn't added a test Bug: 263323082 Bug: 267298837 Test: atest BluetoothInstrumentationTests Tag: #stability Change-Id: Icc2f8c49453744e1db36b30954867e79ef361fcf (cherry picked from commit 1a670ca10b51642fa4a8e3a0e84a5f787a92d676) (cherry picked from commit 25ebac43442ce02a97e576c0648156138b04e4e8) Merged-In: Icc2f8c49453744e1db36b30954867e79ef361fcf
| * | | | Merge "Add missing connection call for LeAudio service" into tm-qpr-devWilliam Escande2023-03-011-1/+7
| |\ \ \ \
| | * | | | Add missing connection call for LeAudio serviceGrzegorz Kołodziejczyk2023-03-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds missing connection call for LeAudio service which triggers creating LeAudio device descriptor. Tag: #feature Bug: 266029936 Test: atest --no-bazel-mode LeAudioServiceTest#testCreateStateMachineStackEvents Change-Id: I71560c9124c78bbba9f752efbafc8f4a7fd26faa (cherry picked from commit 18cb242554059d4b245a7d75f11daf6cb41bc384) Merged-In: I71560c9124c78bbba9f752efbafc8f4a7fd26faa
| * | | | | Merge "Refactoring API names to increase scope for future" into tm-qpr-devWilliam Escande2023-03-0117-124/+134
| |\ \ \ \ \
| | * | | | | Refactoring API names to increase scope for futureMd Shahriar Hossain Sajib2023-02-2117-124/+134
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dirty cherry-pick to not expose new API on T Bug: 269363672 Bug: 263323082 Test: atest BluetoothInstrumentationTests Tag: #feature (cherry picked from commit 2bf529b70fb558f1ed08dd028d7fa4d3ee13f405) Merged-In: Ib0ef1fdc3a9dd03f89b9d67d6b490d9f287b5828 Change-Id: I1ab2aa93646795f90177b2e0f234c317801865e3
| * | | | | Merge "[HFP] Broadcast inband ringing status to HF" into tm-qpr-devWilliam Escande2023-03-015-41/+108
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [HFP] Broadcast inband ringing status to HFJosh Wu2023-02-145-41/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from Wear os Bug: 263323082 Bug: 237054503 Test: atest BluetoothInstrumentationTests Merged-In: I40b76a358d3fd13a32b7154f2e3966a9b0ff6603 Change-Id: I40b76a358d3fd13a32b7154f2e3966a9b0ff6603 (cherry picked from commit 713924f39f1f6c4f7b3d80ea4b95951e155e47de) (cherry picked from commit 632cac52184621ba2f1816f924a227eae2030061)
| * | | | | Ignore flaky testHieu Dang2023-02-271-0/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore onOptionsItemSelected_clearAllSelected_promptWarning Bug: 269733670 Bug: 268424815 Test: BluetoothInstrumentationTests Tag: #refactor Change-Id: I3d0c744535c0704249956a9c59e8baf89bcfb929 (cherry picked from commit 31e5d5b6f9e65a21781c5be9ffa954c398efa8df) Merged-In: I3d0c744535c0704249956a9c59e8baf89bcfb929
| * | | | Merge "Update TYPE_ADVERTISING_DATA_TYPE to 8" into tm-qpr-devChienyuan Huang2023-02-241-1/+1
| |\ \ \ \
| | * | | | Update TYPE_ADVERTISING_DATA_TYPE to 8Chienyuan Huang2023-02-221-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 269801218 Test: manual Change-Id: Ic93bd99305928e123a8d0f2af7190cba0411b7f7 Merged-In: Ic93bd99305928e123a8d0f2af7190cba0411b7f7
| * | | | Use system properties to config GATT parametersUgo Yu2023-02-231-27/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from wear OS and fixed property name Bug: 263323082 Bug: 264843198 Test: atest BluetoothInstrumentationTests Change-Id: Ida572a7874c78a100529e8a843861a7d8aab7379 (cherry picked from commit df6e7f2b827757b2d103899ff748357debdc76f6) (cherry picked from commit d66d3032384faa8b0ae4f2070502d8a80c40f9c5) Merged-In: Ida572a7874c78a100529e8a843861a7d8aab7379
| * | | | Address consoildation: check dual map first when get deviceChienyuan Huang2023-02-201-16/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 262679188 Test: manual Change-Id: I6a0a301c7040dd33f62bf5293b2ef5dc923cd28e Merged-In: I6a0a301c7040dd33f62bf5293b2ef5dc923cd28e
| * | | Merge changes from topic ↵William Escande2023-02-152-6/+345
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "cherrypicker-L20900000958303793:N37600001331385366" into tm-qpr-dev * changes: Add additional HeadsetClientStateMachineTest Disable in-band ring if more than one device is connected Rename wear property to be more homgenous
| | * | Add additional HeadsetClientStateMachineTestÖmer Faruk Yılmaz2023-02-141-4/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 263323082 Bug: 237467631 Test: atest HeadsetClientStateMachineTest Merged-In: I73eeb473de94ae830cb38ea57edc4b23ab5f99c3 Change-Id: I73eeb473de94ae830cb38ea57edc4b23ab5f99c3 (cherry picked from commit 5bc7f1a3be64011067ea94d6e2ff8211e244bc7b)
| | * | Disable in-band ring if more than one device is connectedWilliam Escande2023-02-141-2/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable in-band ringtone only if more than one device is connected. Don't disable if second device is still in connecting state. Merged-In: I0fa53a7865420466ad70733877ef2c2db534d188 Change-Id: I0fa53a7865420466ad70733877ef2c2db534d188 Bug: 263323082 Bug: 203061441 Test: Manual testing (cherry picked from commit 1e9890eb9a96826c5ca37fcf032876562da78b6f)