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

Unverified Commit 29650c32 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r26' into staging/lineage-19.0_merge-android-12.0.0_r26

Android 12.0.0 release 26

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYdSrUgAKCRDorT+BmrEO
# eJuTAJsHowM4AzgffixzyS6thBsVk0TcGQCffThS4dOWgbFVdQglJ1EQN3PNGT4=
# =glkZ
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jan  4 22:17:22 2022 EET
# 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 1020 signatures in the past
#      2 months.  Encrypted 4 messages in the past 3 days.
# 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 Oliver Woodman (4) and others
# Via Android Build Coastguard Worker
* tag 'android-12.0.0_r26': (25 commits)
  Ignore ui mode change caused by Morris overlay in PiP
  Fix issue with alphas not being applied to the same view on unlock
  Fix SysUI volume controls not appearing
  Plumb config to output switcher indication chip
  Re-enable volume control for non-grouped devices
  Tweak volume adjustment rules
  Only register listeners if setView was success.
  Fix normalize doesn't work on carrier template
  Update deletion conditions for a package's UsageStats.
  setTurnScreenOn can only used as wakeup
  Block SHELL_UID from overlay fabricate and clear shell overlays on boot
  Revert "Revert "[pm] remove old stage dirs on low storage""
  [RESTRICT AUTOMERGE] Hide Wi-Fi Scanning message when Location is disabled (QS Internet Dialog)
  Fix black frame flicker in UNOCCLUDE transition.
  Import translations. DO NOT MERGE ANYWHERE
  [SystemUI] 1.Remove the unnecessary log 2. update signal icon in bg thread
  Import translations. DO NOT MERGE ANYWHERE
  Add config to detect e-call call based on dialed sim emerg # list.
  [RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet Dialog
  Update the BroadcastQueue logic for runtime permissions
  ...

 Conflicts:
	packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java

Change-Id: I3c9d2be4975e4f469ad97b8d86501ab8391d673d
parents 6d9d10f6 acc28837
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