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

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

Merge tag 'android-security-10.0.0_r60' into staging/lineage-17.1_merge-android-security-10.0.0_r60

Android security 10.0.0 release 60

* tag 'android-security-10.0.0_r60':
  TIF: fix issue of using caller-aware methods after clearCallingIdentity()
  [DO NOT MERGE] Fixing unsafe pending intent in notification
  Backporting the change of ag/15629060 to qt-dev
  DO NOT MERGE Bluetooth: Fix formatting in getAlias()
  camera2: Fix exception swallowing in params classes createFromParcel

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationModeController.java

Change-Id: I58696f93b3d03ba8037113f7d040784e4b5394a8
parents ba6f7056 2b65ceda
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