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

Skip to content
Unverified Commit 1ab2e129 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android Security 14.0.0 Release 17 (12787469)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ6D2/wAKCRDorT+BmrEO
# eLqpAJ0TS93S2Mg377oJIS7QuaMPpP6vvgCdGO4Hag5WYBQpDxn/YCl+ALRTQ70=
# =og50
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Feb  3 19:03:59 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Grant Menke (2) and others
# Via Android Build Coastguard Worker
* tag 'android-security-14.0.0_r17':
  Unbind CS if connection is not created within 15 seconds.
  Revert "DO NOT MERGE"
  Resolve cross-user image exploit for conference status hints
  Unbind CallScreeningService when timeout reached.
  DO NOT MERGE Unbind CS if connection is not created within 15 seconds.

 Conflicts:
	src/com/android/server/telecom/ConnectionServiceWrapper.java
	tests/src/com/android/server/telecom/tests/CallsManagerTest.java

Change-Id: If9df0b361ba51e531bd191451426555a998d0c48
parents fcc9a883 66037caa
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