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

Skip to content
Unverified Commit 2ff7bb28 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 12.0.0 release 18

* tag 'android-12.0.0_r18': (633 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Fix normalize doesn't work on carrier template
  [RESTRICT AUTOMERGE] Hide Wi-Fi Scanning message when Location is disabled (QS Internet Dialog)
  [DO NOT MERGE] Revert "Fixed the performance of unlocking when dozing"
  Import translations. DO NOT MERGE ANYWHERE
  Use SystemUI theme to inflate FrameLayout and SplashScreenView
  Ensure we clear mPackagesWithShareRequests when a remote exception happens at write() or start().
  Ensure end action is called if keyguard animation is cancelled
  Add config to detect e-call call based on dialed sim emerg # list.
  Fixed an issue where using UDFPS always dismissed the shade
  [DO NOT MERGE] Handle IllegalStateException in APM event handling.
  Fixed the performance of unlocking when dozing
  [SystemUI] 1.Remove the unnecessary log 2. update signal icon in bg thread
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Update the BroadcastQueue logic for runtime permissions
  Fix initialization of snapshot SkImage instance
  Conditionally cache RenderEffect results
  [RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet Dialog
  [RESTRICT AUTOMERGE] Add WiFi scan notify message (QS Internet Dialog)
  ...

 Conflicts:
	packages/SystemUI/src/com/android/keyguard/LockIconView.java
	packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
	packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollHelper.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollProgressBarDrawable.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollProgressBarSegment.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
	packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
	packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
	packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java
	packages/SystemUI/tests/src/com/android/systemui/keyguard/LockIconViewControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
	services/core/java/com/android/server/display/DisplayModeDirector.java
	services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java

 Manually edited:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

Change-Id: I70454178aefb80df19aafb39f8aaa7a9ed0a7e33
parents 560255f8 6c2cb687
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