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

Skip to content
Unverified Commit 37fd0557 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpQAKCRDorT+BmrEO
# eOxsAJ9P+6mJ1GYrlyEhvgxoXhY6uaRflgCgiYkZvtWspiTAqwUP7diZ1L+A4rY=
# =3yGN
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:05 2024 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 2296 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 (192) and others
# Via Android (Google) Code Review (3884) and others
* tag 'android-14.0.0_r50': (4732 commits)
  Revert "Add the Finder shutdown message to AOSP"
  Don't throw ANR if onTimeout flag is disabled.
  Revert "Anisotropy correction for external displays only"
  Anisotropy correction for external displays only
  Revert StatusBarManager disable logging
  Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true
  Revert^2 [Mobile] Make sure we +1 the reported level if INFLATE_SIGNAL_STRENGTH is true
  Update media_controls_lock_screen setting behavior
  [Mobile] Wrap AccessibilityContentDescriptions in a static getter
  Revert "Update media_controls_lock_screen setting behavior"
  Revert "[CDM][CMD] Check permissions for CDM shell commands"
  [CDM][CMD] Check permissions for CDM shell commands
  Inline notification_row_user_context
  Revert "AudioService: optimize BT device config change"
  Merge changes from topic "fbe-wipe-no-reboot" into main am: fd9335cd am: 4073ee27
  AccessibilityManagerService: remove uninstalled services from enabled list after service update.
  Add more checkKeyIntent checks to AccountManagerService.
  Fix error handling for non-dynamic permissions
  Update media_controls_lock_screen setting behavior
  [Autofill Framework] Add in check for intent filter when setting/updating service
  ...

 Conflicts:
	apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/app/admin/IDevicePolicyManager.aidl
	core/java/android/view/IWindowManager.aidl
	core/res/res/values-eu/strings.xml
	core/res/res/values-hi/strings.xml
	core/res/res/values-te/strings.xml
	core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java
	libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
	libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java
	libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
	libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
	nfc/java/android/nfc/cardemulation/ApduServiceInfo.java
	packages/CompanionDeviceManager/res/values-bs/strings.xml
	packages/CompanionDeviceManager/res/values-es-rUS/strings.xml
	packages/CompanionDeviceManager/res/values-et/strings.xml
	packages/CompanionDeviceManager/res/values-hu/strings.xml
	packages/CompanionDeviceManager/res/values-in/strings.xml
	packages/PackageInstaller/res/values-ky/strings.xml
	packages/SystemUI/Android.bp
	packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt
	packages/SystemUI/res/layout/bluetooth_tile_dialog.xml
	packages/SystemUI/res/values-af/strings.xml
	packages/SystemUI/res/values-am/strings.xml
	packages/SystemUI/res/values-ar/strings.xml
	packages/SystemUI/res/values-as/strings.xml
	packages/SystemUI/res/values-az/strings.xml
	packages/SystemUI/res/values-b+sr+Latn/strings.xml
	packages/SystemUI/res/values-be/strings.xml
	packages/SystemUI/res/values-bg/strings.xml
	packages/SystemUI/res/values-bn/strings.xml
	packages/SystemUI/res/values-bs/strings.xml
	packages/SystemUI/res/values-ca/strings.xml
	packages/SystemUI/res/values-cs/strings.xml
	packages/SystemUI/res/values-da/strings.xml
	packages/SystemUI/res/values-de/strings.xml
	packages/SystemUI/res/values-el/strings.xml
	packages/SystemUI/res/values-en-rAU/strings.xml
	packages/SystemUI/res/values-en-rCA/strings.xml
	packages/SystemUI/res/values-en-rGB/strings.xml
	packages/SystemUI/res/values-en-rIN/strings.xml
	packages/SystemUI/res/values-en-rXC/strings.xml
	packages/SystemUI/res/values-es-rUS/strings.xml
	packages/SystemUI/res/values-es/strings.xml
	packages/SystemUI/res/values-et/strings.xml
	packages/SystemUI/res/values-eu/strings.xml
	packages/SystemUI/res/values-fa/strings.xml
	packages/SystemUI/res/values-fi/strings.xml
	packages/SystemUI/res/values-fr-rCA/strings.xml
	packages/SystemUI/res/values-fr/strings.xml
	packages/SystemUI/res/values-gl/strings.xml
	packages/SystemUI/res/values-gu/strings.xml
	packages/SystemUI/res/values-hi/strings.xml
	packages/SystemUI/res/values-hr/strings.xml
	packages/SystemUI/res/values-hu/strings.xml
	packages/SystemUI/res/values-hy/strings.xml
	packages/SystemUI/res/values-in/strings.xml
	packages/SystemUI/res/values-is/strings.xml
	packages/SystemUI/res/values-it/strings.xml
	packages/SystemUI/res/values-iw/strings.xml
	packages/SystemUI/res/values-ja/strings.xml
	packages/SystemUI/res/values-ka/strings.xml
	packages/SystemUI/res/values-kk/strings.xml
	packages/SystemUI/res/values-km/strings.xml
	packages/SystemUI/res/values-kn/strings.xml
	packages/SystemUI/res/values-kn/tiles_states_strings.xml
	packages/SystemUI/res/values-ko/strings.xml
	packages/SystemUI/res/values-ky/strings.xml
	packages/SystemUI/res/values-lo/strings.xml
	packages/SystemUI/res/values-lt/strings.xml
	packages/SystemUI/res/values-lv/strings.xml
	packages/SystemUI/res/values-mk/strings.xml
	packages/SystemUI/res/values-ml/strings.xml
	packages/SystemUI/res/values-mn/strings.xml
	packages/SystemUI/res/values-mr/strings.xml
	packages/SystemUI/res/values-ms/strings.xml
	packages/SystemUI/res/values-my/strings.xml
	packages/SystemUI/res/values-nb/strings.xml
	packages/SystemUI/res/values-ne/strings.xml
	packages/SystemUI/res/values-nl/strings.xml
	packages/SystemUI/res/values-or/strings.xml
	packages/SystemUI/res/values-pa/strings.xml
	packages/SystemUI/res/values-pl/strings.xml
	packages/SystemUI/res/values-pt-rBR/strings.xml
	packages/SystemUI/res/values-pt-rPT/strings.xml
	packages/SystemUI/res/values-pt/strings.xml
	packages/SystemUI/res/values-ro/strings.xml
	packages/SystemUI/res/values-ru/strings.xml
	packages/SystemUI/res/values-si/strings.xml
	packages/SystemUI/res/values-sk/strings.xml
	packages/SystemUI/res/values-sl/strings.xml
	packages/SystemUI/res/values-sq/strings.xml
	packages/SystemUI/res/values-sr/strings.xml
	packages/SystemUI/res/values-sv/strings.xml
	packages/SystemUI/res/values-sw/strings.xml
	packages/SystemUI/res/values-ta/strings.xml
	packages/SystemUI/res/values-te/strings.xml
	packages/SystemUI/res/values-th/strings.xml
	packages/SystemUI/res/values-tl/strings.xml
	packages/SystemUI/res/values-tr/strings.xml
	packages/SystemUI/res/values-uk/strings.xml
	packages/SystemUI/res/values-ur/strings.xml
	packages/SystemUI/res/values-uz/strings.xml
	packages/SystemUI/res/values-vi/strings.xml
	packages/SystemUI/res/values-zh-rCN/strings.xml
	packages/SystemUI/res/values-zh-rHK/strings.xml
	packages/SystemUI/res/values-zh-rTW/strings.xml
	packages/SystemUI/res/values-zu/strings.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/shared/Android.bp
	packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
	packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/biometrics/dagger/BiometricsModule.kt
	packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
	packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt
	packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/SeekBarObserver.kt
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
	packages/SystemUI/src/com/android/systemui/qs/QSHost.java
	packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
	packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java
	packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegate.kt
	packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt
	packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
	packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.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/ScreenshotView.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/PhoneStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
	packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
	packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
	packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java
	packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegateTest.kt
	packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt
	packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotNotificationSmartActionsTest.java
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt
	packages/SystemUI/tests/utils/src/com/android/systemui/authentication/data/repository/FakeAuthenticationRepository.kt
	services/core/java/com/android/server/BatteryService.java
	services/core/java/com/android/server/display/DisplayPowerController.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/inputmethod/InputMethodManagerService.java
	services/core/java/com/android/server/pm/ComputerEngine.java
	services/core/java/com/android/server/policy/PhoneWindowManager.java
	services/core/java/com/android/server/wm/Session.java
	services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

Change-Id: If804b2a43558180d7050e1c471c8a77e76032b81
parents a4296270 ae7c8db0
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