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

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

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

Android Security 14.0.0 Release 20 (13218413)

* tag 'android-security-14.0.0_r20':
  [CDM] Checks NLS component name instead of package name
  [SPA] Add biometric authentication for package modification

Conflicts:
	src/com/android/settings/Utils.java
	src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
	src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
	tests/spa_unit/src/com/android/settings/spa/app/appinfo/PackageInfoPresenterTest.kt

Change-Id: I6b5ac6b6b9aec65827c10ae9de493dc5821914a3
parents 6cfb695d 986d8762
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