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

Skip to content
Unverified Commit 8c3dda3e authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r71' of...

Merge tag 'android-security-11.0.0_r71' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-18.1_merge_android-security-11.0.0_r71

Android security 11.0.0 release 71

* tag 'android-security-11.0.0_r71' of https://android.googlesource.com/platform/frameworks/base:
  Improve user handling when querying for resumable media
  Update AccountManagerService checkKeyIntentParceledCorrectly.
  Forbid granting access to NLSes with too-long component names
  Ignore virtual presentation windows - RESTRICT AUTOMERGE
  DO NOT MERGE Grant carrier privileges if package has carrier config access.
  DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS."

Conflicts:
	packages/SystemUI/src/com/android/systemui/media/MediaBrowserFactory.java
	packages/SystemUI/src/com/android/systemui/media/MediaResumeListener.kt
	packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java
	packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowserFactory.java
	packages/SystemUI/tests/src/com/android/systemui/media/MediaResumeListenerTest.kt

Change-Id: I89e5a3d9ed4b9e1068b8b4e40a72d8b4cc07627a
parents dccf6f8e 0b8224a5
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