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

Skip to content
Unverified Commit 5f3fd9ff authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-12.1.0_r5' into staging/lineage-19.1_android-security-12.1.0_r6

Android security 12.1.0 release 5

* tag 'android-security-12.1.0_r5':
  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.
  Resolve account image icon profile boundary exploit.
  Fix vulnerability in CallRedirectionService.
  Resolve StatusHints image exploit across user.
  Call Redirection: unbind service when onBind returns null
  enforce stricter rules when registering phoneAccounts
  DO NOT MERGE do not process content uri in call Intents
  Ensure service unbind when receiving a null call screening service in onBind.
  Fix security vulnerability when register phone accounts.
  Hide overlay windows when showing phone account enable/disable screen.
  Fix security vulnerability issue for multi user call redirections.
  switch TelecomManager List getters to ParceledListSlice
  limit TelecomManager#registerPhoneAccount to 10
  Handle null bindings returned from ConnectionService.

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

Change-Id: I93245421214cbf76b936023c997a144d70c2ab04
parents a97e84d0 a8da08c8
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