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

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

Merge tag 'android-security-13.0.0_r9' of...

Merge tag 'android-security-13.0.0_r9' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-20.0_merge_android-security-13.0.0_r9

Android security 13.0.0 release 9

* tag 'android-security-13.0.0_r9' of https://android.googlesource.com/platform/frameworks/base:
  Improve user handling when querying for resumable media
  Update AccountManagerService checkKeyIntentParceledCorrectly.
  [DO NOT MERGE] Update quickshare intent rather than recreating
  Forbid granting access to NLSes with too-long component names
  Ignore virtual presentation windows - RESTRICT AUTOMERGE
  DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS."

Conflicts:
	packages/SystemUI/src/com/android/systemui/media/controls/resume/MediaResumeListener.kt
	packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
	packages/SystemUI/tests/src/com/android/systemui/media/controls/resume/MediaResumeListenerTest.kt
	packages/SystemUI/tests/src/com/android/systemui/media/controls/resume/ResumeMediaBrowserTest.kt

Change-Id: I1779378e2d096c363f0766d637f570319addad67
parents eb2f4d32 3e09cce1
Loading
Loading
Loading
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