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

Skip to content
Unverified Commit 7510f316 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW4wAKCRDorT+BmrEO
# eNOPAJ9upXOvPnhNvsP9G5QF/IXaybMnlQCfUKbKtcdJ1TZYXpI4PRsK1udOdXo=
# =pjtv
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:59 2024 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 2345 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# 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 (708) and others
# Via Automerger Merge Worker (76793) and others
* tag 'android-14.0.0_r29': (8714 commits)
  Revert "Deprecate setRemoteAdapter that takes service intent"
  Revert "Deprecate notifyAppWidgetViewDataChanged"
  Flag getSdkSandboxApplicationInfoForInstrumentation
  Revert "Flag getSdkSandboxApplicationInfoForInstrumentation"
  Flag getSdkSandboxApplicationInfoForInstrumentation
  Revert "Pass the correct user ID to SetProcessProfilesCached()"
  Ignoring user touch feedback settings for keyguard udfps authentication.
  Revert "Pass the correct user ID to SetProcessProfilesCached()"
  Pass the correct user ID to SetProcessProfilesCached()
  Pass the correct user ID to SetProcessProfilesCached()
  Pass the correct user ID to SetProcessProfilesCached()
  Pass the correct user ID to SetProcessProfilesCached()
  Work around the flicker on enter PiP for foldables
  Always sync user restriction state to UserManager
  Disallow system apps to be installed/updated as instant.
  Add default shortcut for tracing Skia's GPU memory usage
  Fix the grid artifacts in simplex noise
  Add old lockAnimationClock(long) back
  Make ControlsActivity translucent
  Default divider interaction to true if transition doesn't succeed
  ...

 Conflicts:
	cmds/idmap2/idmap2d/Idmap2Service.cpp
	cmds/idmap2/idmap2d/Idmap2Service.h
	core/java/android/app/IActivityManager.aidl
	core/java/android/app/LoadedApk.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/hardware/Camera.java
	core/java/android/hardware/display/DisplayManager.java
	core/java/android/os/PowerManager.java
	core/java/android/view/IWindowManager.aidl
	core/java/android/view/KeyEvent.java
	core/java/com/android/internal/os/BinderfsStatsReader.java
	core/java/com/android/internal/view/RotationPolicy.java
	core/java/com/android/internal/widget/ILockSettings.aidl
	core/java/com/android/internal/widget/LockPatternView.java
	core/java/com/android/internal/widget/LockscreenCredential.java
	core/jni/android_media_AudioSystem.cpp
	core/res/AndroidManifest.xml
	core/tests/coretests/src/com/android/internal/os/BinderfsStatsReaderTest.java
	data/keyboards/Generic.kcm
	libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
	libs/androidfw/AssetManager.cpp
	packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
	packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
	packages/SystemUI/Android.bp
	packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java
	packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
	packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
	packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/SystemUI/src/com/android/systemui/authentication/data/repository/AuthenticationRepository.kt
	packages/SystemUI/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractor.kt
	packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
	packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt
	packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/PatternBouncerViewModel.kt
	packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
	packages/SystemUI/src/com/android/systemui/flags/Flags.kt
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsPowerDialog.java
	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/navigationbar/NavigationBar.java
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt
	packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
	packages/SystemUI/src/com/android/systemui/qs/QSPanelController.java
	packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
	packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
	packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
	packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
	packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
	packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsViewModel.java
	packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderController.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
	packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
	packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
	packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
	packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.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/globalactions/GlobalActionsDialogLiteTest.java
	packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt
	packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/ImageExporterTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsActivityTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsViewModelTest.java
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java
	packages/SystemUI/tests/utils/src/com/android/systemui/authentication/data/repository/FakeAuthenticationRepository.kt
	services/core/Android.bp
	services/core/java/com/android/server/audio/AdiDeviceState.java
	services/core/java/com/android/server/audio/AudioDeviceInventory.java
	services/core/java/com/android/server/audio/AudioService.java
	services/core/java/com/android/server/backup/SystemBackupAgent.java
	services/core/java/com/android/server/display/DisplayPowerController2.java
	services/core/java/com/android/server/input/InputSettingsObserver.java
	services/core/java/com/android/server/net/NetworkPolicyManagerService.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/core/java/com/android/server/notification/PreferencesHelper.java
	services/core/java/com/android/server/pm/PackageManagerService.java
	services/core/java/com/android/server/policy/PhoneWindowManager.java
	services/core/java/com/android/server/power/PowerManagerService.java
	services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
	services/core/java/com/android/server/wm/ActivityRecord.java
	services/core/java/com/android/server/wm/ActivityRecordInputSink.java
	services/core/java/com/android/server/wm/ActivityTaskManagerService.java
	services/core/java/com/android/server/wm/RemoteDisplayChangeController.java
	services/core/java/com/android/server/wm/RootWindowContainer.java
	services/core/jni/com_android_server_power_PowerManagerService.cpp
	services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordLoggerTest.java

Change-Id: I0d8c5ad10045f820ef5435bd7abfb1a63a6cf1d7
parents 1aa3f624 f45c3bc5
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