Skip to content
Snippets Groups Projects
  1. Jul 07, 2024
  2. Jun 29, 2024
  3. Jun 27, 2024
  4. Jun 24, 2024
    • Dhina17's avatar
      Merge tag 'android-14.0.0_r50' into fourteen · cc1ee549
      Dhina17 authored
      Android 14.0.0 Release 50 (AP2A.240605.024)
      
       Conflicts:
      	apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
      	core/java/android/app/ActivityManagerInternal.java
      	core/java/android/content/pm/UserInfo.java
      	core/java/android/hardware/input/IInputManager.aidl
      	core/java/android/view/IWindowManager.aidl
      	core/java/android/view/ViewRootImpl.java
      	core/jni/android_media_AudioSystem.cpp
      	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
      	data/etc/privapp-permissions-platform.xml
      	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
      	media/java/android/media/RingtoneManager.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/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt
      	packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java
      	packages/SettingsLib/src/com/android/settingslib/notification/EnableZenModeDialog.java
      	packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
      	packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
      	packages/SystemUI/Android.bp
      	packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt
      	packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java
      	packages/SystemUI/res/layout/bluetooth_tile_dialog.xml
      	packages/SystemUI/res/layout/qs_footer_impl.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/strings.xml
      	packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
      	packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
      	packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
      	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/controls/ui/ControlActionCoordinatorImpl.kt
      	packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
      	packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
      	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
      	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.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/NavigationBar.java
      	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
      	packages/SystemUI/src/com/android/systemui/navigationbar/buttons/ButtonDispatcher.java
      	packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java
      	packages/SystemUI/src/com/android/systemui/qs/QSFooterView.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/InternetDialogDelegate.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/settings/UserTrackerImpl.kt
      	packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.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/data/repository/StatusBarModePerDisplayRepository.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
      	packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustmentProvider.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java
      	packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
      	packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
      	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
      	packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
      	packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
      	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/model/SignalIconModel.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/binder/MobileIconBinder.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/ui/view/ModernStatusBarMobileView.kt
      	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/binder/WifiViewBinder.kt
      	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/user/data/repository/UserRepository.kt
      	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/InternetDialogDelegateControllerTest.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/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/AlertingNotificationManagerTest.java
      	packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt
      	packages/SystemUI/tests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java
      	packages/SystemUI/tests/utils/src/com/android/systemui/authentication/data/repository/FakeAuthenticationRepository.kt
      	services/core/Android.bp
      	services/core/java/com/android/server/BatteryService.java
      	services/core/java/com/android/server/biometrics/sensors/face/FaceService.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/input/NativeInputManagerService.java
      	services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
      	services/core/java/com/android/server/pm/AppsFilterBase.java
      	services/core/java/com/android/server/pm/LauncherAppsService.java
      	services/core/java/com/android/server/policy/PhoneWindowManager.java
      	services/core/java/com/android/server/trust/TrustManagerService.java
      	services/core/java/com/android/server/wm/ActivityRecord.java
      	services/core/java/com/android/server/wm/ActivityStarter.java
      	services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java
      	services/core/java/com/android/server/wm/ActivityTaskManagerService.java
      	services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
      	services/core/java/com/android/server/wm/Session.java
      	services/core/jni/com_android_server_input_InputManagerService.cpp
      	services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
      	services/usb/Android.bp
      
      Change-Id: I22893edd499346489f9faef629e35ed40879a1bd
      cc1ee549
  5. Jun 22, 2024
  6. Jun 10, 2024
Loading