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

Skip to content
Unverified Commit 8d29f6c8 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 14.0.0 Release 17 (UQ1A.231205.015)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPkQAKCRDorT+BmrEO
# eMGfAJ9dguavvZF0DXTVEJG4B6s4kxfRZQCePs6wtXoZx1FcQuLFPJrE7qLU5J8=
# =c8OE
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec  6 21:46:25 2023 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 2194 signatures in the past
#      2 years.  Encrypted 4 messages in the past 23 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 (679) and others
# Via Automerger Merge Worker (13783) and others
* tag 'android-14.0.0_r17': (3119 commits)
  Consume pending display config change with multiple remote callbacks
  Consume pending display config change with multiple remote callbacks
  Consume pending display config change with multiple remote callbacks
  Consume pending display config change with multiple remote callbacks
  Revert "Resolve session linger caused by RemoteFillService."
  DMS: check cached mode for user apps only
  DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for normal ecc call.
  Add logs and traces when draw doesn't run
  Add DisplayManager Logging
  Add logs and traces when draw doesn't run
  Add DisplayManager Logging
  Extend the BIND_APPLICATION_TIMEOUT
  fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly
  Fix getWallpaperSafeLocked
  Handle error connecting to KeychainService
  Allow mixed handler to handle transitions that might enter PIP
  Play SLEEP transitions if they contain changes
  Re-write conditional checks for animation
  [DO NOT MERGE] Revert "Mitigation for mass GC deletion"
  [DO NOT MERGE] Revert "Send cached target duration when creating sessions"
  ...

 Conflicts:
	core/java/android/app/Dialog.java
	core/java/android/hardware/display/DisplayManager.java
	core/res/res/values/config.xml
	libs/dream/lowlight/src/com/android/dream/lowlight/LowLightTransitionCoordinator.kt
	libs/hwui/renderthread/HintSessionWrapper.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
	packages/SystemUI/res/xml/large_screen_shade_header.xml
	packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt
	packages/SystemUI/src/com/android/systemui/flags/Flags.kt
	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
	packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt
	packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
	packages/SystemUI/src/com/android/systemui/shade/ShadeLogger.kt
	packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
	packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java
	packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
	packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java
	packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
	packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt
	packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
	packages/SystemUI/tests/utils/src/com/android/systemui/broadcast/FakeBroadcastDispatcher.kt
	services/core/java/com/android/server/accounts/AccountManagerService.java
	services/core/java/com/android/server/display/feature/DeviceConfigParameterProvider.java
	services/core/java/com/android/server/dreams/DreamController.java
	services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
	services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
	services/core/java/com/android/server/wm/TransitionController.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java

Change-Id: I236370922d5f56428ec01638c2313347b4ad7227
parents 2ed7dc64 6ff78c36
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