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

Unverified Commit d13d7625 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-14.0.0_r22' into staging/lineage-21.0_android-security-14.0.0_r22

Android Security 14.0.0 Release 22 (13793696)

* tag 'android-security-14.0.0_r22':
  [RESTRICT AUTOMERGE] Fix audio AppOps refcount mismatch
  [RESTRICT AUTOMERGE] Validate full attr chain for recording
  [RESTRICT AUTOMERGE] Move AudioRecordClient out of AudioPolicyService

Conflicts:
	services/audiopolicy/service/Android.bp
	services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
	services/audiopolicy/service/AudioPolicyService.cpp
	services/audiopolicy/service/AudioRecordClient.cpp
	services/audiopolicy/service/AudioRecordClient.h

Change-Id: I8b1cb87831ea2b9336f233a787c9767d54a77bf9
parents f9e221de 7dc39f43
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