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

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

Merge tag 'android-security-10.0.0_r53' into staging/lineage-17.1_merge_android-security-10.0.0_r53

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  [DO NOT MERGE] Close screenshot process on user switched
  [SettingsProvider] extend font size scale range
  DO NOT MERGE: Do not inject mock location to chipset
  Add method to clear out SubscriptionInfo#getCardString
  Whitelist READ_PRIVILEGED_PHONE_STATE for the contacts provider
  Update the getIccId docs to reflect access requirements
  DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL.
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI

Conflicts:
	core/java/com/android/internal/util/ScreenshotHelper.java

Change-Id: Ic1c0d262b7c2fde90d11080eec6f799ff48af7f5
parents 2a9f078e b73ef520
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