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

Skip to content
Commit ab78ebe1 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r16' of...

Merge tag 'android-security-14.0.0_r16' of https://android.googlesource.com/platform/frameworks/base into lineage-21.0

Android security 14.0.0 release 16

* tag 'android-security-14.0.0_r16' of https://android.googlesource.com/platform/frameworks/base:
  Always show all approved apps
  Pass SafeActivityOptions with actual caller for startActivityInTF
  Update checkKeyIntent
  Fix allowlist token issues
  Enforce hard limits on hosts per package and widgets per host.
  enforce limits for VisualVoicemailSmsFilterSettings properties

 Conflicts:
	core/java/android/app/Notification.java
	core/tests/coretests/src/android/os/ParcelTest.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

Change-Id: I9530fca5ed26da32a1eb5f5ee9860992ae0957e4
parents 3cb1e421 0a23febf
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