78048ace06
Merge "camera2 ndk/vndk: cleanup->stop CameraDevice's looper in ~ACameraDevice()" into qt-r1-dev
...
am: 95f6e43fa2
5 years ago
95f6e43fa2
Merge "camera2 ndk/vndk: cleanup->stop CameraDevice's looper in ~ACameraDevice()" into qt-r1-dev
5 years ago
fe403b8494
Merge "Merge "Camera: Destroy jpeg handle in 'encodeGrayscaleJpeg'" into qt-dev am: 62a6173c54 am: 91c9dcb862" into qt-r1-dev-plus-aosp
5 years ago
0d79daa282
Merge "Camera: Destroy jpeg handle in 'encodeGrayscaleJpeg'" into qt-dev am: 62a6173c54
...
am: 91c9dcb862
5 years ago
07f2cbe4f8
Merge "Camera: Destroy jpeg handle in 'encodeGrayscaleJpeg'" into qt-dev am: 62a6173c54
...
am: 253e8188fe
5 years ago
253e8188fe
Merge "Camera: Destroy jpeg handle in 'encodeGrayscaleJpeg'" into qt-dev
...
am: 62a6173c54
5 years ago
91c9dcb862
Merge "Camera: Destroy jpeg handle in 'encodeGrayscaleJpeg'" into qt-dev
...
am: 62a6173c54
5 years ago
62a6173c54
Merge "Camera: Destroy jpeg handle in 'encodeGrayscaleJpeg'" into qt-dev
5 years ago
174084011c
camera2 ndk/vndk: cleanup->stop CameraDevice's looper in ~ACameraDevice()
...
It's possible that the following sequence happens:
1) hwbinder / binder thread T1: onResultReceived() starts -> promotes wp<CameraDevice> to sp<>;
2) Some other app thread T2 : ACameraDevice_close() -> delete ACameraDevice -> doesn't result in
CameraDevice's destructor running since mCameraDevice has another live
reference, app destroys some object O1.
3) T3 (callback looper thread): callback is received since looper is still running which accesses
dead app object O1 -> results in undefined behavior.
4) T1: onResultReceived completes and CameraDevice is destructed
We need to stop CameraDevice's looper thread (that waits for all callbacks queued to complete) in
~ACameraDevice() so we receive no callbacks after ACameraDevice is closed.
Bug: 135641415
Test: CTS native tests: no new failures
Test: AImageReaderVendorTest; enroll; while(1) auth;
Change-Id: Ia24de753f6ee409d941fff39616f09df2164880a
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
5 years ago
8c0c624772
Merge "audio policy: mute call RX when SCO volume is 0" into qt-dev am: a426cf1c3d
...
am: a5a6788d8e
5 years ago
ccc12e8c37
Merge "audio policy: mute call RX when SCO volume is 0" into qt-dev am: a426cf1c3d
...
am: 0fdb6247dc
5 years ago
a5a6788d8e
Merge "audio policy: mute call RX when SCO volume is 0" into qt-dev
...
am: a426cf1c3d
5 years ago
0fdb6247dc
Merge "audio policy: mute call RX when SCO volume is 0" into qt-dev
...
am: a426cf1c3d
5 years ago
a426cf1c3d
Merge "audio policy: mute call RX when SCO volume is 0" into qt-dev
5 years ago
490e2062a4
Merge "libcamera2ndk_vendor: stop looper thread on ~ACameraDevice()" into qt-r1-dev
...
am: 1c388a30c1
5 years ago
1c388a30c1
Merge "libcamera2ndk_vendor: stop looper thread on ~ACameraDevice()" into qt-r1-dev
5 years ago
b233eaef6a
libcamera2ndk_vendor: stop looper thread on ~ACameraDevice()
...
Bug: 135641415
Test: enroll; while(1) auth;
Change-Id: I59c522a0e8827c5990926f0cf7c7960e1cea2e5e
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
5 years ago
c75b5ccfcd
Merge "Enable count-based expiration for media metrics" into qt-dev am: 239ff11cdb
...
am: 9801ee51b6
5 years ago
07366746c5
Merge "Enable count-based expiration for media metrics" into qt-dev am: 239ff11cdb
...
am: 69b360177a
5 years ago
9801ee51b6
Merge "Enable count-based expiration for media metrics" into qt-dev
...
am: 239ff11cdb
5 years ago
69b360177a
Merge "Enable count-based expiration for media metrics" into qt-dev
...
am: 239ff11cdb
5 years ago
239ff11cdb
Merge "Enable count-based expiration for media metrics" into qt-dev
5 years ago
23f4d6cc61
Enable count-based expiration for media metrics
...
in addition to the time-based expiration, enable count based expiration
and set it to 2000 records, about 5x the daily average. Caps the memory
footprint.
Bug: 135552978
Test: boot, enough traffic to force expirations
Change-Id: Ide96df24b00e8f115905678800c782f29a91bcba
5 years ago
e67991ee89
Merge "stagefright: Fix OmxInfoBuilder assignment of kFlagIsHardwareAccelerated" into qt-dev am: 29081e67bb
...
am: 3bd9e0e1a1
5 years ago
4e64be95d7
Merge "stagefright: Fix OmxInfoBuilder assignment of kFlagIsHardwareAccelerated" into qt-dev am: 29081e67bb
...
am: 4e18cd505b
5 years ago
3bd9e0e1a1
Merge "stagefright: Fix OmxInfoBuilder assignment of kFlagIsHardwareAccelerated" into qt-dev
...
am: 29081e67bb
5 years ago
4e18cd505b
Merge "stagefright: Fix OmxInfoBuilder assignment of kFlagIsHardwareAccelerated" into qt-dev
...
am: 29081e67bb
5 years ago
29081e67bb
Merge "stagefright: Fix OmxInfoBuilder assignment of kFlagIsHardwareAccelerated" into qt-dev
5 years ago
10d8c128cf
Merge "Migrate buffers during surface change" into qt-dev am: 5ff7ff550b
...
am: e4a8f66ea6
5 years ago
e7e2b7c894
Merge "Migrate buffers during surface change" into qt-dev am: 5ff7ff550b
...
am: 31a81a3517
5 years ago
e4a8f66ea6
Merge "Migrate buffers during surface change" into qt-dev
...
am: 5ff7ff550b
5 years ago
31a81a3517
Merge "Migrate buffers during surface change" into qt-dev
...
am: 5ff7ff550b
5 years ago
5ff7ff550b
Merge "Migrate buffers during surface change" into qt-dev
5 years ago
802640623c
[automerger skipped] Merge "Move one last caller off ZipString." am: 4c76131a07 am: a05d870629 -s ours
...
am: 85c2aa8eccb52f0a0a9c
5 years ago
85c2aa8ecc
[automerger skipped] Merge "Move one last caller off ZipString." am: 4c76131a07
...
am: a05d870629b52f0a0a9c
5 years ago
a05d870629
Merge "Move one last caller off ZipString."
...
am: 4c76131a07
5 years ago
8e6c71f513
stagefright: Fix OmxInfoBuilder assignment of kFlagIsHardwareAccelerated
...
OmxInfoBuilder would only add kFlagIsHardwareAccelerated to attr if
attribute::software-code exists in the node attributes
This change inverts this logic
Author: Michael Gonzalez <michgonz@codeaurora.org>
CRs-Fixed: 2430504
Bug: 132939417
Change-Id: I9813098c062732b2a992350d72d59e52fd67292b
5 years ago
94c98021b7
Camera: Destroy jpeg handle in 'encodeGrayscaleJpeg'
...
Make sure 'jpeg_destroy_compress()' is always called
before leaving 'encodeGrayscaleJpeg()'.
Additionally fix misspelling of 'intrinsic'.
Bug: 135622974
Test: atest
cts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java#testDynamicDepth
--generate-baseline=12
Change-Id: I55c1f86881ba05aac6aac6981df5fcb276c9d4da
5 years ago
4c76131a07
Merge "Move one last caller off ZipString."
5 years ago
4547b91fd5
[automerger skipped] Merge "CCodec: increase timeout for operations" into qt-dev am: a69eacc42c
...
am: b184f9bcbc9ee5a7cba5
5 years ago
990c522205
Merge "CCodec: increase timeout for operations" into qt-dev am: a69eacc42c
...
am: f7463ea232
5 years ago
b184f9bcbc
Merge "CCodec: increase timeout for operations" into qt-dev
...
am: a69eacc42c
5 years ago
f7463ea232
Merge "CCodec: increase timeout for operations" into qt-dev
...
am: a69eacc42c
5 years ago
a69eacc42c
Merge "CCodec: increase timeout for operations" into qt-dev
5 years ago
a52eee82f5
Move one last caller off ZipString.
...
(I haven't switched this to std::string because the code's already been
removed internally, so there's no point.)
Bug: http://b/129068177
Test: treehugger
Change-Id: I5675d65b2f74f06e68a9de570741a88ed1899eca
Merged-In: I723570315285d7c2caadffd71cd2d15efde11819
5 years ago
e40a76a371
Merge "Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d7628 am: 51dbe4829e" into qt-r1-dev-plus-aosp
5 years ago
5f3ca1c949
Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d7628
...
am: 1d2eb44eef
5 years ago
7341c75fea
Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d7628
...
am: 51dbe4829e
5 years ago
1d2eb44eef
Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev
...
am: c6ad7d7628
5 years ago
51dbe4829e
Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev
...
am: c6ad7d7628
5 years ago
Jayant Chowdhary
Android Build Merger (Role)
Emilian Peev
TreeHugger Robot
Eric Laurent
Andrew Chant
Ray Essick
Chong Zhang
Sungtak Lee
Elliott Hughes
Praveen Chavan
Wonsik Kim
Dichen Zhang