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

Skip to content
Unverified Commit 8acf7b39 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
# eDl/AJ9DKA7YWCgqbfWyZi2DaiqYVzJCmwCcCudlhs2frChLcMq0TYlTd/eOYPA=
# =7+w/
# -----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 1233 signatures in the past
#      7 months.  Encrypted 4 messages in the past 5 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 (85) and others
# Via Automerger Merge Worker (518) and others
* tag 'android-12.1.0_r7': (351 commits)
  DO NOT MERGE: Revert "RESTRICT AUTOMERGE: Polish IME transition from fullscree..."
  [DO NOT MERGE] Force extra nav bar provide side gesture insets
  Disallow PAP authentication when MPPE is requested
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  [DO NOT MERGE] Fixed status bar glitch for apps that access internal res
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Fix NPE
  Fix NPE
  Fix NPE
  Fix NPE
  Fix NPE
  Fix NPE
  ...

 Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java
	services/core/java/com/android/server/audio/AudioDeviceBroker.java

Change-Id: I82f36e1a4a564d36b86a60e0bef0a15816bba061
parents 87f04da0 9cdf73f7
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