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

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

Merge tag 'android-security-14.0.0_r21' into staging/lineage-21.0_android-security-14.0.0_r21

Android security 14.0.0 release 21

* tag 'android-security-14.0.0_r21':
  PM: Restrict subclass construction.
  Guard against excessively long package names and certificates.
  fix: Unbind an A11yService from onNullBinding
  Fixing the default values for pending intent at LocationPendingIntentTransport.
  Use ParceledListSlice for ZenModeConfig and AutomaticZenRules
  DO NOT MERGE: Verify KeyEvents in IME
  Zero-initialize CursorWindow buffer
  Only allow load frro drawables from frro directory

Conflicts:
	core/java/android/app/AutomaticZenRule.java
	core/java/android/app/INotificationManager.aidl
	core/java/android/app/NotificationManager.java
	core/java/android/content/res/ResourcesImpl.java
	core/java/android/service/notification/ZenModeConfig.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java

Change-Id: I4129c2999da5132d225280e52d9f583b21faec98
parents 388d4eee 97a40b9d
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