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

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

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

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

Android Security 11.0.0 Release 72 (10763435)

* tag 'android-security-11.0.0_r72' of https://android.googlesource.com/platform/frameworks/base:
  Revert "DO NOT MERGE Dismiss keyguard when simpin auth'd and..."
  [RESTRICT AUTOMERGE] Ignore small source rect hint
  RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets
  Add userId check before loading icon in Device Controls
  Fixing DatabaseUtils to detect malformed UTF-16 strings
  Disallow loading icon from content URI to PipMenu
  Fix KCM key mapping cloning
  [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews
  Do not share key mappings with JNI object
  Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.
  Import translations. DO NOT MERGE ANYWHERE
  Add placeholder when media control title is blank
  RingtoneManager: verify default ringtone is audio

Conflicts:
	packages/SystemUI/src/com/android/systemui/controls/management/ControlAdapter.kt
	packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
	packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

Change-Id: Icf9a002c965930f95e3be5c7a23954143ab35c96
parents ef438ae1 9213632d
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