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

Skip to content
Unverified Commit 882d9566 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzqAAKCRDorT+BmrEO
# eM1YAJ44hQnLqO38gMqjR39WEiO6YqPLjgCggXwuWL4UUA03EpkP6OyIfwuCZok=
# =MH//
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:08 2024 EEST
# 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 2527 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 Pranav Madapurmath (18) and others
# Via Android (Google) Code Review (47) and others
* tag 'android-14.0.0_r50': (64 commits)
  Correct issue in unflagged code path for separatelyBindToBtIncallService.
  Import translations. DO NOT MERGE ANYWHERE
  Move getLastKnownCellIdentity to its own flag.
  CallLogManager & TestApp updates given business composer changes
  Fix CTS Test Failures.
  export the business_call_composer flag so g3 clients can consume
  Integrate Calling Restrictions into the outgoing call flow
  Update the flag for the fix related to the profile user issues
  Resolve Ringer#getUri Telecom usages
  Prevent reset of EmergencyCallDiagnosticLogger active call timestamp
  add a try/catch when dumping Emrg diagnostics
  add impl for getRegisteredPhoneAccounts
  Adds TransactionManager dumpsys info and cleanups
  Add implementation of handle external messages from wired headset, dock and speaker, mute toggle and focus switching.
  Separate TelecomManager#isInSelfManagedCall APIs
  Demote "putExtras failed due to null CS" error to a warning.
  impl transactional video API methods
  Fix flag bug id.
  Log the business call composer values if set
  Formalize EXTRA_SKIP_CALL_FILTERING as system API
  ...

 Conflicts:
	src/com/android/server/telecom/CallLogManager.java
	src/com/android/server/telecom/PhoneAccountRegistrar.java

Change-Id: Idde0639b4067b8f30990bdef239f0ebf3bdc4b1e
parents ee475e27 afd9c6c8
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