Skip to content
Unverified Commit 735dcabf authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzqQAKCRDorT+BmrEO
# eLG9AJwMfwRuCe/+bKQSnR15cYFjNmm/IACeIfMs1x4SZyy5mHqDeFWCfDy4SMI=
# =7Fr6
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:09 2024 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2542 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Eric Biggers (3) and others
# Via Automerger Merge Worker (18) and others
* tag 'android-14.0.0_r50':
  Delete unused code conditional on MANAGE_MISC_DIRS
  Add API to get remaining lifetime as a percentage.
  Add time_offset=<UTC offset> to mount arguments
  Don't use std::allocator::pointer
  Remove userSerial param from vold methods that don't use it
  vold: remove session keyring workaround for old kernels
  Reduce AppFuse max read size.

 Conflicts:
	KeyUtil.cpp

Change-Id: I27cf6365a8982c40e24707748720b75b4659fea0
parents cfb169c2 ce1a5042
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment