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

Skip to content
Unverified Commit 7f834b58 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.1.0_r7' into staging/lineage-19.1_merge-android-12.1.0_r7

Android 12.1.0 Release 7 (SQ3A.220605.009.A1)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYp57OgAKCRDorT+BmrEO
# eHbtAJ90sYR+Gie7nM8rd8AiKH2vD9F0DACfWKuCRaui/gRnR2pu65PtvZKlGuk=
# =DxHV
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun  7 01:10:02 2022 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 1197 signatures in the past
#      7 months.  Encrypted 4 messages in the past 4 months.
# 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 Bill Yi (4) and others
# Via Automerger Merge Worker (21) and others
* tag 'android-12.1.0_r7':
  Import translations. DO NOT MERGE ANYWHERE
  limit TelecomManager#registerPhoneAccount to 10
  Handle null bindings returned from ConnectionService.
  DO NOT MERGE Re-restrict phone ops on user addition
  Revert "Remove BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS for ConnectionService bind."
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: Icb1a9fa3b224844e24203a614aeef3735361bfc6
parents 036c7c72 b783110a
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