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

Skip to content
Commit 95ae8d1f authored by Michael Bestas's avatar Michael Bestas Committed by Nishith Khanna
Browse files

Merge tag 'android-security-15.0.0_r10' into staging/lineage-22.2_merge-android-security-15.0.0_r10

Android Security 15.0.0 Release 10 (13793697)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaLcitgAKCRDorT+BmrEO
# eKcQAJ9egQZPntvkA1gUOGO6gzQN2Y53EQCdF5qsX/O/3HFEIRXZfQKTy6e9VQ8=
# =ISOZ
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Sep  2 20:00:38 2025 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-security-15.0.0_r10': (23 commits)
  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
  Drop PendingIntent extras from external packages during enrollment.
  Do not enable the Content Protection toggle for non-admin users.
  AppRestrictions - use vetted component
  Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings.
  Disable the ContentProtection setting switch bar when current user is a guest user.
  [CDM] Checks NLS component name instead of package name
  Check package name format before using it for SPA nav
  [SPA] Add biometric authentication for package modification
  Remove incorrect call to Window.addFlags with a system flag
  Check the permission of the callingUid instead of the calling package
  Set component name only for ConfirmDeviceCredentialActivity.
  [Safer intents] App Time Spent Preference
  Don't let profiles open the UserSettings overflow [DO NOT MERGE]
  Block the content scheme intent in AccountTypePreferenceLoader
  [CDM][NLS] Check if the NLS service has an intent-filter
  Checks cross user permission before handling intent
  ...

 Conflicts:
	src/com/android/settings/accessibility/AccessibilitySettings.java
	src/com/android/settings/applications/AppInfoBase.java
	src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
	src/com/android/settings/security/ContentProtectionTogglePreferenceController.java
	src/com/android/settings/users/AppRestrictionsFragment.java
	src/com/android/settings/users/UserSettings.java
	tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
	tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
	tests/robotests/src/com/android/settings/security/ContentProtectionTogglePreferenceControllerTest.java

Change-Id: I8cb282480b2a75cca58e381c17e72ebba2aceb0d
parent 771e49cc
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