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

Skip to content
Unverified Commit 158a581d authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Merge tag 'android-security-14.0.0_r15' of https://android.googlesource.com/platform/frameworks/base into lineage-21.0

Android Security 14.0.0 Release 15 (12496787)

* tag 'android-security-14.0.0_r15' of https://android.googlesource.com/platform/frameworks/base:
  Allow uninstalling DMRH when not used for management
  Properly handle onNullBinding() in appwidget service.
  Block clipboard UI when device is locked

 Conflicts:
	packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardListener.java
	packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java

Change-Id: I2bb529d8999199a655f970bff4aa80deac94d6ec
parents 2031865f 6ad2d597
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