Skip to content
Snippets Groups Projects
Commit 72a84a02 authored by Dhina17's avatar Dhina17
Browse files

Merge tag 'android-15.0.0_r1' into fifteen

Android 15.0.0 release 1

 Conflicts:
	core/java/android/app/ActivityManagerInternal.java
	core/java/android/app/ContextImpl.java
	core/java/android/app/IActivityManager.aidl
	core/java/android/hardware/Camera.java
	core/java/android/hardware/camera2/CameraManager.java
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/net/VpnManager.java
	core/java/com/android/internal/widget/MessagingLinearLayout.java
	core/jni/android_hardware_Camera.cpp
	core/res/res/layout/transient_notification_with_icon.xml
	core/res/res/values/config.xml
	data/etc/com.android.settings.xml
	data/etc/com.android.systemui.xml
	data/etc/privapp-permissions-platform.xml
	libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
	packages/PackageInstaller/src/com/android/packageinstaller/PackageUtil.java
	packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.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/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/FakeWifiRepository.kt
	packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcherTest.kt
	packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt
	packages/SystemUI/res-keyguard/layout/footer_actions.xml
	packages/SystemUI/res/layout-land/volume_dialog.xml
	packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml
	packages/SystemUI/res/values-ar/strings.xml
	packages/SystemUI/res/values-bs/strings.xml
	packages/SystemUI/res/values-ca/strings.xml
	packages/SystemUI/res/values-es-rUS/strings.xml
	packages/SystemUI/res/values-eu/strings.xml
	packages/SystemUI/res/values-fa/strings.xml
	packages/SystemUI/res/values-fr-rCA/strings.xml
	packages/SystemUI/res/values-gl/strings.xml
	packages/SystemUI/res/values-hr/strings.xml
	packages/SystemUI/res/values-hy/strings.xml
	packages/SystemUI/res/values-is/strings.xml
	packages/SystemUI/res/values-it/strings.xml
	packages/SystemUI/res/values-ja/strings.xml
	packages/SystemUI/res/values-kk/strings.xml
	packages/SystemUI/res/values-kn/strings.xml
	packages/SystemUI/res/values-ko/strings.xml
	packages/SystemUI/res/values-mk/strings.xml
	packages/SystemUI/res/values-ms/strings.xml
	packages/SystemUI/res/values-nl/strings.xml
	packages/SystemUI/res/values-or/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-ru/strings.xml
	packages/SystemUI/res/values-sk/strings.xml
	packages/SystemUI/res/values-sl/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-tr/strings.xml
	packages/SystemUI/res/values-zh-rHK/strings.xml
	packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/Utilities.java
	packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
	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/dagger/BiometricsModule.kt
	packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptCredentialInteractor.kt
	packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
	packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
	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/NavigationBarInflaterView.java
	packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt
	packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
	packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java
	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/tileimpl/QSTileImpl.java
	packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
	packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogDelegate.kt
	packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java
	packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
	packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java
	packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt
	packages/SystemUI/src/com/android/systemui/screenshot/ActionProxyReceiver.java
	packages/SystemUI/src/com/android/systemui/screenshot/CropView.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/LongScreenshotData.java
	packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
	packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureController.java
	packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.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/NotificationShadeWindowViewController.java
	packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java
	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/inflation/NotifUiAdjustmentProvider.kt
	packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.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/KeyguardBypassController.kt
	packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconControllerImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
	packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java
	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt
	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt
	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt
	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt
	packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryViaTrackerLib.kt
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
	packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java
	packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java
	packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
	packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java
	packages/SystemUI/tests/src/com/android/systemui/navigationbar/gestural/BackPanelControllerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.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/notification/row/NotificationInfoTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt
	packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryViaTrackerLibTest.kt
	packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt
	packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt
	packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/CentralSurfacesKosmos.kt
	packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconsInteractor.kt
	services/core/Android.bp
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/am/UserController.java
	services/core/java/com/android/server/backup/SystemBackupAgent.java
	services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
	services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
	services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java
	services/core/java/com/android/server/display/AutomaticBrightnessController.java
	services/core/java/com/android/server/display/DisplayPowerController.java
	services/core/java/com/android/server/display/brightness/strategy/AutomaticBrightnessStrategy.java
	services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
	services/core/java/com/android/server/input/InputManagerService.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/locksettings/LockSettingsService.java
	services/core/java/com/android/server/net/NetworkManagementService.java
	services/core/java/com/android/server/notification/NotificationManagerPrivate.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/ComputerEngine.java
	services/core/java/com/android/server/pm/UserManagerService.java
	services/core/java/com/android/server/pm/UserTypeFactory.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/trust/TrustManagerService.java
	services/core/java/com/android/server/wm/ActivityClientController.java
	services/core/java/com/android/server/wm/AppWarnings.java
	services/core/java/com/android/server/wm/RecentTasks.java
	services/core/java/com/android/server/wm/Session.java
	services/core/jni/com_android_server_input_InputManagerService.cpp
	services/core/jni/com_android_server_power_PowerManagerService.cpp
	services/core/jni/com_android_server_power_PowerManagerService.h
	services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java
	services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
	services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java

Change-Id: If9e47b877159bc4854b5b1e8bfb0e3307501ac17
parents f32f8fa7 4e43ad12
No related branches found
No related tags found
Loading
Showing
with 472 additions and 171 deletions
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