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

Unverified Commit 4c1bc5cf authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-16.0.0_r2' into staging/lineage-23.1_merge-android-security-16.0.0_r3

Android Security 16.0.0 Release 2 (14094968)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaR9+CQAKCRDorT+BmrEO
# eFEjAJ9VzNQmCelNO9AojNVRhs88RFa4MwCghkWgOeeboaDASl5/wiszDp30IxI=
# =6zIL
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu Nov 20 22:46:01 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Bill Yi (20) and others
# Via Android Build Coastguard Worker
* tag 'android-security-16.0.0_r2': (139 commits)
  Fix build failure in release branch
  Implement onNullBinding() in autofill service connection
  PrintSpooler: Require empty output for PDF
  cleanup: Fix permission protection of setObservedMotionEventSources
  Trim oversized strings in setId and setConversationId
  Check DPC package validity during package updates
  DevicePolicyManager: ignore invalid proxy settings
  Ensuring valid packageName when granting slice permission
  [RESTRICT AUTOMERGE] Disallow PINNED in setLaunchWindowingMode
  Prevent root from getting unverified attributions from non system apps
  Don't allow SdkSandbox to bypass systemUid check.
  Calculate how much memory is used per account.
  Prevent non-system ShutdownActivity from being launched by BatteryService
  Don't allow hiding SysUi
  Avoid mixups between different CPSes in ZenModeConditions
  Move BP window to Keyguard_dialog
  Limits the display name to 1024 characters
  Do not allow custom animation of untrusted Toast
  Use consistent animation when forcibly hiding non system overlay
  Ignore pinned Windows
  ...

 Conflicts:
	core/api/system-current.txt
	core/java/android/hardware/biometrics/BiometricEnrollmentStatus.aidl
	core/java/android/hardware/biometrics/BiometricEnrollmentStatus.java
	core/java/android/hardware/biometrics/BiometricEnrollmentStatusInternal.aidl
	core/java/android/hardware/biometrics/BiometricManager.java
	core/java/android/hardware/biometrics/IAuthService.aidl
	core/java/android/hardware/biometrics/flags.aconfig
	core/java/android/os/CombinedMessageQueue/MessageQueue.java
	core/java/android/service/dreams/DreamService.java
	core/java/android/view/SurfaceControlViewHost.java
	core/java/android/view/WindowlessWindowManager.java
	core/java/android/window/flags/window_surfaces.aconfig
	core/java/android/window/flags/windowing_frontend.aconfig
	core/java/com/android/internal/widget/remotecompose/core/operations/ComponentData.java
	core/res/res/values-da/strings.xml
	core/res/res/values-fa/strings.xml
	core/res/res/values-iw/strings.xml
	core/res/res/values-mk/strings.xml
	core/res/res/values-mr/strings.xml
	core/res/res/values-pt-rBR/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-sw/strings.xml
	core/res/res/values-watch/config.xml
	core/res/res/values-zh-rCN/strings.xml
	libs/WindowManager/Shell/res/values-af/strings.xml
	libs/WindowManager/Shell/res/values-am/strings.xml
	libs/WindowManager/Shell/res/values-ar/strings.xml
	libs/WindowManager/Shell/res/values-as/strings.xml
	libs/WindowManager/Shell/res/values-az/strings.xml
	libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml
	libs/WindowManager/Shell/res/values-be/strings.xml
	libs/WindowManager/Shell/res/values-bg/strings.xml
	libs/WindowManager/Shell/res/values-bn/strings.xml
	libs/WindowManager/Shell/res/values-bs/strings.xml
	libs/WindowManager/Shell/res/values-ca/strings.xml
	libs/WindowManager/Shell/res/values-cs/strings.xml
	libs/WindowManager/Shell/res/values-da/strings.xml
	libs/WindowManager/Shell/res/values-de/strings.xml
	libs/WindowManager/Shell/res/values-el/strings.xml
	libs/WindowManager/Shell/res/values-en-rAU/strings.xml
	libs/WindowManager/Shell/res/values-en-rGB/strings.xml
	libs/WindowManager/Shell/res/values-en-rIN/strings.xml
	libs/WindowManager/Shell/res/values-es-rUS/strings.xml
	libs/WindowManager/Shell/res/values-es/strings.xml
	libs/WindowManager/Shell/res/values-et/strings.xml
	libs/WindowManager/Shell/res/values-eu/strings.xml
	libs/WindowManager/Shell/res/values-fa/strings.xml
	libs/WindowManager/Shell/res/values-fi/strings.xml
	libs/WindowManager/Shell/res/values-fr-rCA/strings.xml
	libs/WindowManager/Shell/res/values-fr/strings.xml
	libs/WindowManager/Shell/res/values-gl/strings.xml
	libs/WindowManager/Shell/res/values-gu/strings.xml
	libs/WindowManager/Shell/res/values-hi/strings.xml
	libs/WindowManager/Shell/res/values-hr/strings.xml
	libs/WindowManager/Shell/res/values-hy/strings.xml
	libs/WindowManager/Shell/res/values-in/strings.xml
	libs/WindowManager/Shell/res/values-is/strings.xml
	libs/WindowManager/Shell/res/values-it/strings.xml
	libs/WindowManager/Shell/res/values-iw/strings.xml
	libs/WindowManager/Shell/res/values-ja/strings.xml
	libs/WindowManager/Shell/res/values-ka/strings.xml
	libs/WindowManager/Shell/res/values-kk/strings.xml
	libs/WindowManager/Shell/res/values-km/strings.xml
	libs/WindowManager/Shell/res/values-kn/strings.xml
	libs/WindowManager/Shell/res/values-ko/strings.xml
	libs/WindowManager/Shell/res/values-ky/strings.xml
	libs/WindowManager/Shell/res/values-lt/strings.xml
	libs/WindowManager/Shell/res/values-lv/strings.xml
	libs/WindowManager/Shell/res/values-mk/strings.xml
	libs/WindowManager/Shell/res/values-ml/strings.xml
	libs/WindowManager/Shell/res/values-mn/strings.xml
	libs/WindowManager/Shell/res/values-mr/strings.xml
	libs/WindowManager/Shell/res/values-my/strings.xml
	libs/WindowManager/Shell/res/values-nb/strings.xml
	libs/WindowManager/Shell/res/values-ne/strings.xml
	libs/WindowManager/Shell/res/values-nl/strings.xml
	libs/WindowManager/Shell/res/values-or/strings.xml
	libs/WindowManager/Shell/res/values-pa/strings.xml
	libs/WindowManager/Shell/res/values-pl/strings.xml
	libs/WindowManager/Shell/res/values-pt-rBR/strings.xml
	libs/WindowManager/Shell/res/values-pt-rPT/strings.xml
	libs/WindowManager/Shell/res/values-pt/strings.xml
	libs/WindowManager/Shell/res/values-ro/strings.xml
	libs/WindowManager/Shell/res/values-ru/strings.xml
	libs/WindowManager/Shell/res/values-si/strings.xml
	libs/WindowManager/Shell/res/values-sk/strings.xml
	libs/WindowManager/Shell/res/values-sq/strings.xml
	libs/WindowManager/Shell/res/values-sr/strings.xml
	libs/WindowManager/Shell/res/values-sv/strings.xml
	libs/WindowManager/Shell/res/values-sw/strings.xml
	libs/WindowManager/Shell/res/values-ta/strings.xml
	libs/WindowManager/Shell/res/values-tl/strings.xml
	libs/WindowManager/Shell/res/values-tr/strings.xml
	libs/WindowManager/Shell/res/values-uk/strings.xml
	libs/WindowManager/Shell/res/values-uz/strings.xml
	libs/WindowManager/Shell/res/values-vi/strings.xml
	libs/WindowManager/Shell/res/values-zh-rCN/strings.xml
	libs/WindowManager/Shell/res/values-zh-rHK/strings.xml
	libs/WindowManager/Shell/res/values-zh-rTW/strings.xml
	libs/WindowManager/Shell/res/values-zu/strings.xml
	packages/CompanionDeviceManager/res/values-af/strings.xml
	packages/CompanionDeviceManager/res/values-am/strings.xml
	packages/CompanionDeviceManager/res/values-ar/strings.xml
	packages/CompanionDeviceManager/res/values-as/strings.xml
	packages/CompanionDeviceManager/res/values-az/strings.xml
	packages/CompanionDeviceManager/res/values-b+sr+Latn/strings.xml
	packages/CompanionDeviceManager/res/values-be/strings.xml
	packages/CompanionDeviceManager/res/values-bg/strings.xml
	packages/CompanionDeviceManager/res/values-bn/strings.xml
	packages/CompanionDeviceManager/res/values-bs/strings.xml
	packages/CompanionDeviceManager/res/values-ca/strings.xml
	packages/CompanionDeviceManager/res/values-cs/strings.xml
	packages/CompanionDeviceManager/res/values-da/strings.xml
	packages/CompanionDeviceManager/res/values-de/strings.xml
	packages/CompanionDeviceManager/res/values-el/strings.xml
	packages/CompanionDeviceManager/res/values-en-rAU/strings.xml
	packages/CompanionDeviceManager/res/values-en-rCA/strings.xml
	packages/CompanionDeviceManager/res/values-en-rGB/strings.xml
	packages/CompanionDeviceManager/res/values-en-rIN/strings.xml
	packages/CompanionDeviceManager/res/values-es-rUS/strings.xml
	packages/CompanionDeviceManager/res/values-es/strings.xml
	packages/CompanionDeviceManager/res/values-et/strings.xml
	packages/CompanionDeviceManager/res/values-eu/strings.xml
	packages/CompanionDeviceManager/res/values-fa/strings.xml
	packages/CompanionDeviceManager/res/values-fi/strings.xml
	packages/CompanionDeviceManager/res/values-fr-rCA/strings.xml
	packages/CompanionDeviceManager/res/values-fr/strings.xml
	packages/CompanionDeviceManager/res/values-gl/strings.xml
	packages/CompanionDeviceManager/res/values-gu/strings.xml
	packages/CompanionDeviceManager/res/values-hi/strings.xml
	packages/CompanionDeviceManager/res/values-hr/strings.xml
	packages/CompanionDeviceManager/res/values-hu/strings.xml
	packages/CompanionDeviceManager/res/values-hy/strings.xml
	packages/CompanionDeviceManager/res/values-in/strings.xml
	packages/CompanionDeviceManager/res/values-is/strings.xml
	packages/CompanionDeviceManager/res/values-it/strings.xml
	packages/CompanionDeviceManager/res/values-iw/strings.xml
	packages/CompanionDeviceManager/res/values-ja/strings.xml
	packages/CompanionDeviceManager/res/values-ka/strings.xml
	packages/CompanionDeviceManager/res/values-kk/strings.xml
	packages/CompanionDeviceManager/res/values-km/strings.xml
	packages/CompanionDeviceManager/res/values-kn/strings.xml
	packages/CompanionDeviceManager/res/values-ko/strings.xml
	packages/CompanionDeviceManager/res/values-ky/strings.xml
	packages/CompanionDeviceManager/res/values-lo/strings.xml
	packages/CompanionDeviceManager/res/values-lt/strings.xml
	packages/CompanionDeviceManager/res/values-lv/strings.xml
	packages/CompanionDeviceManager/res/values-mk/strings.xml
	packages/CompanionDeviceManager/res/values-ml/strings.xml
	packages/CompanionDeviceManager/res/values-mn/strings.xml
	packages/CompanionDeviceManager/res/values-mr/strings.xml
	packages/CompanionDeviceManager/res/values-ms/strings.xml
	packages/CompanionDeviceManager/res/values-my/strings.xml
	packages/CompanionDeviceManager/res/values-nb/strings.xml
	packages/CompanionDeviceManager/res/values-ne/strings.xml
	packages/CompanionDeviceManager/res/values-nl/strings.xml
	packages/CompanionDeviceManager/res/values-or/strings.xml
	packages/CompanionDeviceManager/res/values-pa/strings.xml
	packages/CompanionDeviceManager/res/values-pl/strings.xml
	packages/CompanionDeviceManager/res/values-pt-rBR/strings.xml
	packages/CompanionDeviceManager/res/values-pt-rPT/strings.xml
	packages/CompanionDeviceManager/res/values-pt/strings.xml
	packages/CompanionDeviceManager/res/values-ro/strings.xml
	packages/CompanionDeviceManager/res/values-ru/strings.xml
	packages/CompanionDeviceManager/res/values-si/strings.xml
	packages/CompanionDeviceManager/res/values-sk/strings.xml
	packages/CompanionDeviceManager/res/values-sl/strings.xml
	packages/CompanionDeviceManager/res/values-sq/strings.xml
	packages/CompanionDeviceManager/res/values-sr/strings.xml
	packages/CompanionDeviceManager/res/values-sv/strings.xml
	packages/CompanionDeviceManager/res/values-sw/strings.xml
	packages/CompanionDeviceManager/res/values-ta/strings.xml
	packages/CompanionDeviceManager/res/values-te/strings.xml
	packages/CompanionDeviceManager/res/values-th/strings.xml
	packages/CompanionDeviceManager/res/values-tl/strings.xml
	packages/CompanionDeviceManager/res/values-tr/strings.xml
	packages/CompanionDeviceManager/res/values-uk/strings.xml
	packages/CompanionDeviceManager/res/values-ur/strings.xml
	packages/CompanionDeviceManager/res/values-uz/strings.xml
	packages/CompanionDeviceManager/res/values-vi/strings.xml
	packages/CompanionDeviceManager/res/values-zh-rCN/strings.xml
	packages/CompanionDeviceManager/res/values-zh-rHK/strings.xml
	packages/CompanionDeviceManager/res/values-zh-rTW/strings.xml
	packages/CompanionDeviceManager/res/values-zu/strings.xml
	packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java
	packages/SettingsLib/res/values-gl/strings.xml
	packages/SettingsLib/res/values-hi/strings.xml
	packages/SettingsLib/res/values-in/strings.xml
	packages/SettingsLib/res/values-sw/strings.xml
	packages/SystemUI/accessibility/accessibilitymenu/res/values-zh-rCN/strings.xml
	packages/SystemUI/aconfig/systemui.aconfig
	packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/ui/viewmodel/DeviceEntryUdfpsAccessibilityOverlayViewModelTest.kt
	packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/repository/CustomShortcutCategoriesRepositoryTest.kt
	packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt
	packages/SystemUI/res-keyguard/values-zh-rCN/strings.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-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-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/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
	packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt
	packages/SystemUI/src/com/android/systemui/deviceentry/ui/binder/UdfpsAccessibilityOverlayBinder.kt
	packages/SystemUI/src/com/android/systemui/deviceentry/ui/view/UdfpsAccessibilityOverlay.kt
	packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/AlternateBouncerUdfpsAccessibilityOverlayViewModel.kt
	packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/DeviceEntryUdfpsAccessibilityOverlayViewModel.kt
	packages/SystemUI/src/com/android/systemui/deviceentry/ui/viewmodel/UdfpsAccessibilityOverlayViewModel.kt
	packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/CustomShortcutCategoriesRepository.kt
	packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutCustomizationRequestInfo.kt
	packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt
	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
	packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt
	packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AccessibilityActionsViewBinder.kt
	packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AccessibilityActionsViewModel.kt
	packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt
	packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/data/ui/viewmodel/UdfpsAccessibilityOverlayViewModelKosmos.kt
	packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/AccessibilityActionsViewModelKosmos.kt
	services/core/java/com/android/server/am/UserController.java
	services/core/java/com/android/server/biometrics/AuthService.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/core/java/com/android/server/notification/ZenModeConditions.java
	services/core/java/com/android/server/security/intrusiondetection/NetworkLogSource.java
	services/core/java/com/android/server/wm/EmbeddedWindowController.java
	services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java
	services/core/java/com/android/server/wm/WindowState.java
	services/core/jni/gnss/GnssAssistance.cpp
	services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java
	services/tests/wmtests/src/com/android/server/wm/BackgroundLaunchProcessControllerTests.java
	services/tests/wmtests/src/com/android/server/wm/ImeInsetsSourceProviderTest.java
	services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java

Change-Id: Id068e0771c27c3738a7ff1ec659de0a3b555f0ae
parents c3ba3851 d682c904
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