frameworks-av

Fork

DO NOT MERGE Set module versions to 299900000
Dev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules.

Bug:143377911

Change-Id: Id4339413ca0a78896392c427d6454c138642f0e7

Snap for 5968679 from dac33eaf3984c3f80b51800f0e350bfbded8a1a6 to qt-qpr2-release

Change-Id: I4bb5a31a12a1a7230837691a56573848a19a0945

Merge "Codec2Client: Retry creation on failed transaction" into qt-qpr1-dev

cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera().

The following scenario can occur:

T1 serving Client A's disconnect() call:
T2 : serving Client B's connect() call
T2 : CameraProviderManager::openSession() locks mInterfaceMutex and waits on open() HAL
interface call
T1: updateStatus() locks mStatusListenerMutex
T1: CameraProviderManager::isPublicallyHiddenSecureCamera() waits
on mInterfaceMutex
T2: while waiting on open(), gets a torchModeStatus() callback from the camera HAL
T2: onStatusChanged()
T2: broadcastTorchModeStatus() which waits on mStatusListenerMutex

As a result there's a possible circular hold and wait between T1 and T2.

We cache isPublicallyHiddenSecureCamera in CameraState. That doesn't completely
avoid having to hold mInterfaceLock while calling isPublicallyHiddenSecureCamera() in CameraService
(cache updates), instead it reduces it. We instead need to hold mCameraStates lock which has a
smaller scope.

Bug: 141756275

Test: CTS
Test: GCA (sanity)

Merged-In: I8562c83478b1fe8fbda7c85f97b995985666918d
Merged-In: I4a697c1eaccc3603007be4a595febea981fbeb64
Change-Id: Ie5508afb126a874f76fbbfc2dd19ef79ae6255e0
(cherry picked from commit fd39db81e44e191baa476a579de6cc2618de025a)
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

Android 8.1.0 Release 69 (5794017)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXZfQawAKCRDorT+BmrEO
eByZAJ40ShdvBhsIg/E2eo7t1VWuYjaOMACfVbkJCnQUx7u68pDsl6TiTpgQNYE=
=UuTD
-----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r69' into oreo-x86

Android 8.1.0 Release 69 (5794017)

Snap for 5961254 from f16f21366cbc91778d3e4c57d0d679dafd274d1f to qt-qpr2-release

Change-Id: Ifa9c1df3d795f88c244e475fcb401386912d3d76

Merge "Camera: Release all composite streams during "detachDevice"" into qt-qpr1-dev

Camera: Release all composite streams during "detachDevice"

"CameraDeviceClient" which keeps all references to active
composite streams may not get immediately destroyed after
client disconnect. This means that all registered output
surfaces in composite streams will continue to have
an active connection. In such scenario camera clients will
not be able to re-use the same surface as long as the older
instances are still alive.
Avoid this behavior by explicitly releasing all remaining
composite streams during "detachDevice". The method must
be called as part of the client disconnect and will
ensure that all surface connections are removed.

Bug: 143212133
Test: Camera CTS
Change-Id: I08710645539b687f046116a88576f05bbcbdbaff

aacenc: handle input size not aligned at sample boundary

Bug: 136068046
Bug: 142699551
Test: modified EncoderTest
Change-Id: Ife09efcedf573d4327e8482e03dd82fcafdb5eb2
Merged-In: Ife09efcedf573d4327e8482e03dd82fcafdb5eb2
(cherry picked from commit 3dd7bd3440ef048fa0fcd9d86c42ac75038e9c11)

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

Conflicts:
media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

Snap for 5936642 from ca7582109dd529eb80dff3d6135a20950a9e3b47 to qt-qpr2-release

Change-Id: I2d76b18ef90c2a068262eb373d1c79c9e52035f4

Merge "Camera: Set input timestamp before returning depth jpegs" into qt-qpr1-dev

Codec2Client: Retry creation on failed transaction

This CL moves the retrying logic into ForAllStores(). Before the CL,
CreateInterfaceByName() will fail to detect C2_TRANSACTION_FAILED if the
last service that tries to create the component in ForAllStores() does
not have the requested component.

Test: atest CtsMediaTestCases -- \
--module-arg CtsMediaTestCases:size:small

Bug: 141907195
Change-Id: I98ee084ea14204bba15746e89514636254013aa5

AudioFlinger: enforce OP_RECORD_AUDIO during recording

Fix issue where RecordTrack silencing didn't silence the
full buffer: the memset to 0 was using the RecordThread frame
size, not the RecordTrack frame size.
OP_RECORD_AUDIO was only enforced at the start of a recording
which would fail if not granted. This patch silences the recording
(i.e. silence is recorded instead) when it is lost, and undoes that
when granted again. This requires:
- propagating the package name of the client to the RecordTrack class
- registering an appOp callback in RecordTrack (through a new
OpRecordAudioMonitor class) to (un)silence the recording
- update the isSilenced() method to take into account the appOp.

Bug: 138968594
Bug: 138636979
Test: run app that records audio, then "adb shell appops __pack_name__ 27 2"
and verify recording is silent after that.

Change-Id: I4ebdb2f02409fdf045a77132bf7a1b24249ad948
Merged-In: Ib33f5b592185a67204997213bab1ac2594d90d37
(cherry picked from commit 43def76fcdb1d3a9b14a3f19a4c8a33534f8b003)

Fix OOB access in mpeg4/h263 decoder

The decoder does not support an increase in frame width, and
would exceed its buffer if the width increased mid-stream.
There was an existing check to prevent the total frame size
(width*height) from increasing, but in fact the decoder also
does not even support a width increase, even if the height
decreases correspondingly.

Bug: 136175447
Bug: 136173699
Test: manual
Change-Id: Ic2d28bb0503635dadeb69ba3be9412d58684e910
(cherry picked from commit ef4ce157000b2b5bcbf2bcb36a228ec604803547)

m4v_h263: add a test for invalid/negative value

Test: run poc with and without the patch.
Bug: 134578122
Change-Id: I2d11826d1d9e2669aa5627065dc627729ddc823b
(cherry picked from commit 7802c68aebf7908983508fd4a52a7d53746a80eb)

Snap for 5919859 from b5dd7ae0b90cf66e68680c3f8064f78a23675f36 to qt-qpr2-release

Change-Id: Ica4fb53aab6873a915e4d64fabcb1075f6f8b324

Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into qt-dev am: 7b254210fe
am: b5a3db3e8e

Change-Id: Iaa9c9a4b8c93143fc4277c673c0e2bbf03d430d7

Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into qt-dev
am: 7b254210fe

Change-Id: I06721afc1c0ac492fc7b1b9efbd4af3758325570

Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into qt-dev

[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev am: 1d2cccfd2a -s ours am: 4a47595ece
am: 678e069993

Change-Id: Ic61a1c3d97c17a5eaaf07e8343794877815e1914

[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev am: 1d2cccfd2a -s ours
am: 4a47595ece

Change-Id: I8d1c7e85cae5ec229198508240f00165e2b3fb40

[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev
am: 1d2cccfd2a -s ours
am skip reason: SHA1 1d2cccfd2a skipped by user jmtrivi

Change-Id: I314e39906408bff99d4e0a7cab95b8db640b4b63

Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev

Camera: Set input timestamp before returning depth jpegs

The depth jpeg result and image timestamps must always match.
Set the depth jpeg output surface timestamp accordingly before
returning the resulting output buffer.

Bug: 142011420
Test: atest
cts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java#testDynamicDepthCapture

Change-Id: I2d70367d3cc60014d24cc138e4ca882b2111e161

Merge "ACodec: read max pts gap and max fps keys for image encoders" into qt-qpr1-dev

Merge "Make a copy of output format in onOutputFormatChanged" into qt-qpr1-dev

Merge "Camera: Delay pingCameraServiceProxy to end of onFirstRef" into qt-qpr1-dev

force g711 test to match 1-channel sample data am: ae55cbf717
am: 9956aa2874

Change-Id: I32a041f3b2c6e9ea19bc21476fd17353ac235ab9