Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ee475e27 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW6gAKCRDorT+BmrEO
# eK4dAJ99ZdNYWpaOkamHXPO/QzE6dGtOoACeN00ekHxTysQG9T0ETyFY20Ykucc=
# =5+hx
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:19:06 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2363 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (43) and others
# Via Automerger Merge Worker (1685) and others
* tag 'android-14.0.0_r29': (171 commits)
  Revert "enforcePhoneAccounts should unregister unresolvable accts"
  Remove NPE in VoipCallTransactionResult
  Rename work profile associated users fix flag.
  add flag for transactional CS changes
  Refactor CallsManager listener to track disconnected tone playing status for each calls.
  Ensure the associated call count is accurately tracked for RCS.
  Revert^2 "Fix ringtone play issue via LE devices."
  Revert "Fix audio switch of speaker -> BT LE or speaker -> HA issue."
  Revert^2 "Hearing Aid: Connect route when right HA is connected first"
  Revert "Avoid entering to the connected state of an inactive device in"
  Revert "Fallback to QuiescentBluetoothRoute when abandon focus from"
  Revert "Fix ringtone play issue via LE devices."
  Revert "Hearing Aid: Connect route when right HA is connected first"
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Ensure speaker on notification sent in legacy path
  Update <vibration> to <vibration-effect>
  Reset mute state when entering QuiescentBluetoothState.
  Associate calls with profile user.
  ...

 Conflicts:
	Android.bp
	src/com/android/server/telecom/CallLogManager.java

Change-Id: I4b2e7acba78046515ed2d71929ddb96e1fa0f514
parents 1b883f10 aa581ae1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment