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

Skip to content
Unverified Commit 5b7f96d1 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Merge tag 'android-security-14.0.0_r14' of https://android.googlesource.com/platform/packages/apps/Settings into lineage-21.0

Android security 14.0.0 release 14

* tag 'android-security-14.0.0_r14' of https://android.googlesource.com/platform/packages/apps/Settings:
  Checks cross user permission before handling intent
  startActivityForResult with new Intent
  RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity.

 Conflicts:
	src/com/android/settings/accessibility/AccessibilitySettings.java

Change-Id: I73d626271ac8d328aab95f501d3255bd820e2703
parents 31af99de 2de0dd75
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