Merge "Fix UAF in gatt_cl.cc" into tm-dev am: 813e5845 am: 91c161a1 am: 6c4ef160 am: 60d872c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I157779a1a36195eb1e76c7da6ffe872065fdd82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I4402f4b85f73f7d42fc1f77aae10e53048e9c722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I5597fce8ab90279bd9ce97c05f379e3a4382ebc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: I89af4509c56b2c6c8c836e14e004209314abb38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: Ia35254cb60c07929aedf586fa0eb77e2ffa4aeb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: Ib7c9450d1ead66dd16c00ae3591c2c7efc7b7a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496



Change-Id: Ifa90b6b0ea82c0e6c2017c3782505c16d0967ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  Reject ANDROID AT command if the first param is not String
  Reland "Refine AT command of BluetoothSinkAudioPolicy"
  Clear identity bit when passing address to filter
  Keep the IRK when the scan is finished
  Enhance CLCC inference
  Display Bluetooth Disconnected Message
  Add init_flag for SCO LC3 codec
  Log bluetooth state change in metrics
  Add flag for asha_phy_update_retry_limit
  Add ASHA packet drop frequency limit
  Break out stack::include::smp_status.h

Auto-generated-cl: translation import
Change-Id: Ic9b3da80409239d86a8ca68e3d270bc31b5100b8

The first parameter of ANDROID AT command indicates "type" which should
always be String.

Bug: 283725716
Test: atest BluetoothInstrumentationTests
(cherry picked from https://android-review.googlesource.com/q/commit:e255fcf5ed395b47c0baf8086ab896345bc3ae8d)
Merged-In: Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a
Change-Id: Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a

This reverts commit d6c1f9af.

Reason for revert: b/283725716
Bug: 283725716

Change-Id: Ifd8d19c44f4b0fbfd9b7a88819409d7a8da15336
Merged-In: Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a

Legacy stack kept Identity Address Type without the identity bit set.
It is later passed without any masking to "Add to accept list", "add to
resolving list", and VSC filter command. All these commands specify that
the identity bit should not be set in related specifications.

This is a CP with partial revert of aosp/2030646.

Test: manual test with DCK application
Bug: 201255908
Bug: 280811285
(cherry picked from https://android-review.googlesource.com/q/commit:081966285a12d053e1410868afef4edb575a2fc8)
Merged-In: Id68e81a6706ac40d7394e2803ec3339a7bc44a0a
Change-Id: Id68e81a6706ac40d7394e2803ec3339a7bc44a0a

Bug: 201255908
Bug: 280811285
Test: manually tested against phone with sample IRK scanning app
(cherry picked from https://android-review.googlesource.com/q/commit:fe2d40d739f225cdef2bcae2666f40977ebdb1e6)
Merged-In: I58f8caf2c29bf2b12db2e595d42295b65dc4fa13
Change-Id: I58f8caf2c29bf2b12db2e595d42295b65dc4fa13

sort CLCC response by index
add null check
clear inference when conference call children arrive
clear inference when parent call ends

Bug: 262199042
Test: atest com.android.bluetooth.telephony.BluetoothInCallServiceTest
(cherry picked from https://android-review.googlesource.com/q/commit:de135fd4c6a1ed974314a48f5346bfb7750b81c4)
Merged-In: I35d2f8569af1deb13b830a1f23ec540679435233
Change-Id: I35d2f8569af1deb13b830a1f23ec540679435233

The goal is to communicate an error state which indicates that Bluetooth is disconnected. The pop-up that prompts the user to connect to Bluetooth does not appear again on re-entering the app after it has been dismissed. This has been fixed by creating several statuses which
indicate error conditions, download pending or success statuses. The
specific status NO_DEVICE_CONNECTED will allow for the "Bluetooth is
disconnected" message to display by returning a null result.

Tag: #stability
Bug: 275561845
Test: atest AvrcpControllerTest
(cherry picked from https://android-review.googlesource.com/q/commit:13f31c651f782cdd2c6f068013f50fce58c124fa)
Merged-In: I6fb279d49db4d6cdbc0850a684a22033390b557e
Change-Id: I6fb279d49db4d6cdbc0850a684a22033390b557e

Bug: 282824342
Test: Manual
(cherry picked from https://android-review.googlesource.com/q/commit:41000d71011aa5d0e5b293f38a5a5cb2c38c69d9)
Merged-In: I7378459c3a7738b22e53bf8c5d3bdda417c288ef
Change-Id: I7378459c3a7738b22e53bf8c5d3bdda417c288ef

Bug: 278198192
Test: Unknown
(cherry picked from https://android-review.googlesource.com/q/commit:2323071db3688295f4ed2d4ee801b1276312bdc3)
Merged-In: I2fb2c6945e979e24eaae0d040d3f9ed530a2d64c
Change-Id: I2fb2c6945e979e24eaae0d040d3f9ed530a2d64c

have more control on possible phy update collision

Test: manual
Bug: 280693404
(cherry picked from https://android-review.googlesource.com/q/commit:5674f0de5dd5370de3a6134bd2d7e36e68b2ab33)
Merged-In: Ib57abf4887310ca704b94f3b9938d339f6e194b3
Change-Id: Ib57abf4887310ca704b94f3b9938d339f6e194b3

Some HA companies need packet sequence number to align with real world time.
Limit drop frequency to decrease clock drift heuristic's impact.

Test: manual
Bug: 233715486
(cherry picked from https://android-review.googlesource.com/q/commit:15bfb90d87623d387f1a6d504e47092e4988b663)
Merged-In: Ie698626e27aa28d02a775287e68173e8e79c249e
Change-Id: Ie698626e27aa28d02a775287e68173e8e79c249e

Bug: 282731464
Test: net_test_stack_smp
(cherry picked from https://android-review.googlesource.com/q/commit:7a639a84b58e349628916fd44db6da2ead3aeb89)
Merged-In: I15f52663b0a63399bbb37fdd278cd97a8d84bdbf
Change-Id: I15f52663b0a63399bbb37fdd278cd97a8d84bdbf

Merge "Fix potential abort in btu_av_act.cc" into tm-dev am: 9607396b am: 9d48efea am: b3462f0f am: 92011a77

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715



Change-Id: I731682757f93c83d4fd9b54a856fc64f7a094155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Fix potential abort in btu_av_act.cc" into tm-dev am: 9607396b am: 9d48efea am: b3462f0f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715



Change-Id: Ib9b6d52e38c49275b10543e8435ef568e6a8982f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Fix potential abort in btu_av_act.cc" into tm-dev am: 9607396b am: 9d48efea am: b3462f0f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715



Change-Id: If312b4424e6f27d43303892b4515a776ba756890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715



Change-Id: I9dd980ac9357ade7cdcd885e81145ffab9020e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715



Change-Id: I2d5f430ce8f29596ff6fcccfc1a20caa5342ac6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715



Change-Id: I8706187fb778ea1ca35291b08773fb52181dc335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715



Change-Id: Id0853867c0666ffcf335d6092b74a9d666f7bf08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  Revert "Refine AT command of BluetoothSinkAudioPolicy"
  Revert "shim::LeScanningManager: Use shim storage"
  Revert "rust: Make AttPermissions compatible with libbitflags 2.2.1"
  RESTRICT AUTOMERGE Disable ServiceBluetoothTest test
  Merge udc_daily_340790110 into udc-dev

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d30728e -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23378295



Change-Id: Ia7523ceadeb6d6cb89cde8f970dd187b5c690a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23378295



Change-Id: Ibbb4329a0036cf007a26de52caa3fb6d211f6f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad6b0811 -s ours am: e69d7a91 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23379418



Change-Id: I4943c45ab63716ccaa3d96f920c854ceee792a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23379418



Change-Id: Iad6791c12dde2ed0a39eec5db1ea79ba02bfd48b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23379418



Change-Id: I63605c84a890c69e87bc2e94dcc629bdf4942343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This reverts commit 145b3827.

Reason for revert: b/283725716
Bug: 283725716

Change-Id: I7cea765c9939d3a88daa8f8ffd86a45887163f18
Merged-In: Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a

This reverts commit ff263c53.

Reason for revert: b/283393411
(cherry picked from https://android-review.googlesource.com/q/commit:4ff9b6513dcce62f3e81b8f8cd6ecffb1d7a7459)
Merged-In: Idb4bea1b68c543891cfc7ebb953f1ebfd081e8af
Change-Id: Idb4bea1b68c543891cfc7ebb953f1ebfd081e8af

Reason for revert: libbitflags 2.2.1 is not in udc-dev

This reverts commit e53ccc57.

Bug: 279460991

Change-Id: I7bf47376b709b21d0451afd07748bcedc7507592
Merged-In: I67a64634a5f1bd320f983154c25ba2b7e2a813dc