diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-26 13:09:54 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-09-28 12:06:41 -0700 |
| commit | dc2e6ddc933e40632e79a866d9ece870db1a975e (patch) | |
| tree | 882e16001c7e5bb3c5d259836b9962be16f9e72f /services/camera/libcameraservice/api1/client2 | |
| parent | a67ced9746e6f0d4e03ff8007682091afea71f6c (diff) | |
| download | frameworks_av-dc2e6ddc933e40632e79a866d9ece870db1a975e.zip frameworks_av-dc2e6ddc933e40632e79a866d9ece870db1a975e.tar.gz frameworks_av-dc2e6ddc933e40632e79a866d9ece870db1a975e.tar.bz2 | |
Camera2Client: Revert HALv2 device behavior back to MR2
- Do not idle device before video snapshot stream configuration, to
avoid deadlock during waiting.
- Do not tear down ZSL stream
- Don't refresh ZSL stream after deletion was requested.
The v2 HAL implementations really don't like the ZSL stream being
touched ever.
Bug: 17634430
Bug: 17628507
Change-Id: I36b44a395e697be9802c4bd917a82b77c8d04be2
Diffstat (limited to 'services/camera/libcameraservice/api1/client2')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/ZslProcessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp b/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp index bb72206..8f78103 100644 --- a/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp @@ -154,7 +154,7 @@ status_t ZslProcessor::updateStream(const Parameters ¶ms) { mId, strerror(-res), res); return res; } - if (mDeleted || currentWidth != (uint32_t)params.fastInfo.arrayWidth || + if (currentWidth != (uint32_t)params.fastInfo.arrayWidth || currentHeight != (uint32_t)params.fastInfo.arrayHeight) { res = device->deleteReprocessStream(mZslReprocessStreamId); if (res != OK) { |