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

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

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

Android Security 14.0.0 Release 22 (13793696)

* tag 'android-security-14.0.0_r22':
  Ignore face settings extras when called by an external package.
  startActivityForResult with earlier new Intent
  Hide notification content in history
  Use correct API to get calling package name in CredentialStorage
  Check package name format before using it for SPA nav for udc
  Drop PendingIntent extras from external packages during enrollment.
  AppRestrictions - use vetted component
  Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings.

Conflicts:
	src/com/android/settings/biometrics/face/FaceSettings.java
	src/com/android/settings/spa/SpaActivity.kt
	tests/spa_unit/src/com/android/settings/spa/SpaActivityTest.kt

Change-Id: I1a5f11a81bc3e0ec57b9946858e6eb64db2ce8d9
parents 97065288 1a7b8a57
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