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

Unverified Commit 1e51791e authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-15.0.0_r12' into staging/lineage-22.2_merge-android-security-15.0.0_r12

Android security 15.0.0 release 12

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS3hKwAKCRDorT+BmrEO
# eNRoAJ9JOKgBwPB3su9UTpygcPsr7A/UGgCfU+igGOvcZ9glvlaPwRWx3F43cVI=
# =JFdU
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec  1 20:40:43 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-security-15.0.0_r12':
  Catch IllegalArgumentException when unbinding CallRedirectionServiceConnection
  Revert "Resolve cross account user ringtone validation."
  Resolve cross account user ringtone validation.
  Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup.
  Ensure connection is unbound on call redirection timeout.
  Resolve cross account user icon validation.
  Unbind CS if connection is not created within 15 seconds.
  Revert "Unbind CS if connection is not created within 15 seconds."

 Conflicts:
	src/com/android/server/telecom/ConnectionServiceWrapper.java
	src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java

Change-Id: Ib0532f2a3054b84e702c113fb6e7e2cb78c70d6d
parents 7465b153 98afc8a7
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