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

Skip to content
Unverified Commit 4c1696b6 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r12' of...

Merge tag 'android-security-14.0.0_r12' of https://android.googlesource.com/platform/frameworks/base into HEAD

Android security 14.0.0 release 12

* tag 'android-security-14.0.0_r12' of https://android.googlesource.com/platform/frameworks/base: (80 commits)
  Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()
  DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter
  Fix READ/WRITE operation access issues on Restricted appOps.
  Ensure device_owners2.xml is always written.
  Hide SAW subwindows
  Add unit test to test data overflow when using BinaryXmlSerializer
  Restrict USB poups while setup is in progress
  Rate limiting PiP aspect ratio change request
  Security fix for VPN app killable via lockscreen.
  Verify UID of incoming Zygote connections.
  Fix security vulnerability allowing apps to start from background
  [PM] Send ACTION_PACKAGE_CHANGED when mimeGroups are changed
  [RESTRICT AUTOMERGE] AccessibilityManagerService: remove uninstalled services from enabled list after service update.
  [DO NOT MERGE][Autofill Framework] Add in check for intent filter when setting/updating service
  Check hidden API exemptions
  [Bugfix]migrate user restrictions to DevicePolicyEngine
  Fix bug in screen capture and lock task migrations
  [CDM][CMD] Check permissions for CDM shell commands
  Resolve message/conversation image Uris with the correct user id
  Update media_controls_lock_screen setting behavior
  ...

 Conflicts:
	cmds/idmap2/idmap2/Lookup.cpp
	cmds/idmap2/libidmap2/ResourceContainer.cpp
	core/java/android/app/Notification.java
	core/java/com/android/internal/pm/pkg/component/ParsedAttributionImpl.java
	core/jni/android_content_res_ApkAssets.cpp
	core/jni/android_util_AssetManager.cpp
	core/jni/com_android_internal_os_ZygoteCommandBuffer.cpp
	core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java
	keystore/java/android/security/AndroidKeyStoreMaintenance.java
	libs/androidfw/AssetManager2.cpp
	libs/androidfw/include/androidfw/AssetManager2.h
	libs/androidfw/tests/AssetManager2_test.cpp
	media/java/android/media/session/MediaSession.java
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
	packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
	packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java
	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
	packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataManager.kt
	packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/KeyguardMediaController.kt
	packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt
	packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java
	packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt
	packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerLegacyImpl.kt
	packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
	packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/appops/AppOpsControllerTest.java
	packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
	packages/SystemUI/tests/src/com/android/systemui/qs/external/TileLifecycleManagerTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java
	packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
	services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
	services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/appop/AppOpsService.java
	services/core/java/com/android/server/media/MediaSessionRecord.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/core/java/com/android/server/pm/InstallPackageHelper.java
	services/core/java/com/android/server/pm/PackageManagerService.java
	services/core/java/com/android/server/pm/ShortcutPackage.java
	services/core/java/com/android/server/pm/UserManagerService.java
	services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
	services/core/java/com/android/server/uri/UriGrantsManagerService.java
	services/core/java/com/android/server/wm/ActivityTaskManagerService.java
	services/credentials/java/com/android/server/credentials/CredentialManagerUi.java
	services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
	services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
	services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java
	services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java
	services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
	services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
	services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
	services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
	services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
	startop/view_compiler/Android.bp
	startop/view_compiler/apk_layout_compiler.cc

Change-Id: Iab905333ada465d2a6f9ad4dd0d9dbffc4da5992
parents 7c5216ec a5943822
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